summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgt215.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2018-05-08 13:39:46 +0300
committerBen Skeggs <bskeggs@redhat.com>2018-05-18 08:01:20 +0300
commit46f74a8ad79c4da47190df8492f0534fe8c02652 (patch)
treecf465a8f1b002474a2377f87f628539c2112cc4b /drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgt215.c
parentabc1d4379bafc504b05039db2336b3955b17ffdb (diff)
downloadlinux-46f74a8ad79c4da47190df8492f0534fe8c02652.tar.xz
drm/nouveau/disp/nv50-: simplify definition of overlay channels
Introduces a new method of defining channels available from the display, common to all channel types, allowing for more flexibility in available channel types/counts, and reducing the amount of boiler-plate required. This will be required to support Volta. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgt215.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgt215.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgt215.c
index 3e93db58263f..07c8013eddb9 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgt215.c
@@ -31,12 +31,15 @@ gt215_disp_root = {
.dmac = {
&gt215_disp_core_oclass,
&gt215_disp_base_oclass,
- &gt215_disp_ovly_oclass,
},
.pioc = {
&gt215_disp_oimm_oclass,
&gt215_disp_curs_oclass,
},
+ .user = {
+ {{0,0,GT214_DISP_OVERLAY_CHANNEL_DMA}, g84_disp_ovly_new },
+ {}
+ },
};
static int