diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:15 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:30 +1000 |
| commit | f2c906fc0cf1657e4164e09ae6061534eebd5430 (patch) | |
| tree | 4e68895102b2bd963fdb927307317a3bd80eae25 /drivers/gpu/drm/nouveau/nvkm/engine/disp/gm204.c | |
| parent | 2aa5eac5163fedf09f2d61992cb5ea4d75bec9db (diff) | |
drm/nouveau/disp: transition outp/conn away from being based on nvkm_object
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/gm204.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/gm204.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm204.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm204.c index 89d9839ecf65..8da317468bdf 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm204.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm204.c @@ -88,12 +88,6 @@ gm204_disp_ctor(struct nvkm_object *parent, struct nvkm_object *engine, } struct nvkm_oclass * -gm204_disp_outp_sclass[] = { - &gm204_sor_dp_impl.base.base, - NULL -}; - -struct nvkm_oclass * gm204_disp_oclass = &(struct nv50_disp_impl) { .base.base.handle = NV_ENGINE(DISP, 0x07), .base.base.ofuncs = &(struct nvkm_ofuncs) { @@ -102,8 +96,11 @@ gm204_disp_oclass = &(struct nv50_disp_impl) { .init = _nvkm_disp_init, .fini = _nvkm_disp_fini, }, + .base.outp.internal.crt = nv50_dac_output_new, + .base.outp.internal.tmds = nv50_sor_output_new, + .base.outp.internal.lvds = nv50_sor_output_new, + .base.outp.internal.dp = gm204_sor_dp_new, .base.vblank = &gf110_disp_vblank_func, - .base.outp = gm204_disp_outp_sclass, .mthd.core = &gk104_disp_core_mthd_chan, .mthd.base = &gf110_disp_base_mthd_chan, .mthd.ovly = &gk104_disp_ovly_mthd_chan, |