aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2014-08-10 04:10:25 +1000
committerBen Skeggs <bskeggs@redhat.com>2014-08-10 05:28:06 +1000
commit2c04ae01df38f95dd3e553c85cdac670a80110f5 (patch)
treefbf20ab8598ea25f2df7190bf7b9fff90fc7baee /drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c
parentdrm/nv50/kms: don't assume same class versions for all channels (diff)
downloadlinux-dev-2c04ae01df38f95dd3e553c85cdac670a80110f5.tar.xz
linux-dev-2c04ae01df38f95dd3e553c85cdac670a80110f5.zip
drm/nv50-/disp: share channel creation between nv50/gf110 impls
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to '')
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c
index 198bc4b0d882..448dc912d0ce 100644
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c
@@ -35,11 +35,11 @@
static struct nouveau_oclass
nvf0_disp_sclass[] = {
- { NVF0_DISP_MAST_CLASS, &nvd0_disp_mast_ofuncs },
- { NVF0_DISP_SYNC_CLASS, &nvd0_disp_sync_ofuncs },
- { NVF0_DISP_OVLY_CLASS, &nvd0_disp_ovly_ofuncs },
- { NVF0_DISP_OIMM_CLASS, &nvd0_disp_oimm_ofuncs },
- { NVF0_DISP_CURS_CLASS, &nvd0_disp_curs_ofuncs },
+ { NVF0_DISP_MAST_CLASS, &nvd0_disp_mast_ofuncs.base },
+ { NVF0_DISP_SYNC_CLASS, &nvd0_disp_sync_ofuncs.base },
+ { NVF0_DISP_OVLY_CLASS, &nvd0_disp_ovly_ofuncs.base },
+ { NVF0_DISP_OIMM_CLASS, &nvd0_disp_oimm_ofuncs.base },
+ { NVF0_DISP_CURS_CLASS, &nvd0_disp_curs_ofuncs.base },
{}
};