diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2018-05-08 13:39:46 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2018-05-18 08:01:20 +0300 |
| commit | 46f74a8ad79c4da47190df8492f0534fe8c02652 (patch) | |
| tree | cf465a8f1b002474a2377f87f628539c2112cc4b /drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgk110.c | |
| parent | abc1d4379bafc504b05039db2336b3955b17ffdb (diff) | |
| download | linux-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/rootgk110.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgk110.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgk110.c index 2ebc16687b50..d7e224962e14 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgk110.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgk110.c @@ -31,12 +31,15 @@ gk110_disp_root = { .dmac = { &gk110_disp_core_oclass, &gk110_disp_base_oclass, - &gk104_disp_ovly_oclass, }, .pioc = { &gk104_disp_oimm_oclass, &gk104_disp_curs_oclass, }, + .user = { + {{0,0,GK104_DISP_OVERLAY_CONTROL_DMA}, gk104_disp_ovly_new }, + {} + }, }; static int |