diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2022-06-01 13:46:28 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-07-27 02:05:47 +0300 |
| commit | 1c6aab75ece7c1d450e4561cb2263403eeb7ae2f (patch) | |
| tree | 43313ffacda941dfce7c1498e3dcfea03618e09b /drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | |
| parent | 3517e6b6fee05b6259ca21741cbe5d7bf68aa672 (diff) | |
| download | linux-1c6aab75ece7c1d450e4561cb2263403eeb7ae2f.tar.xz | |
drm/nouveau/disp: merge nv50_disp_new_() and nvkm_disp_new()
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c index bb61ba6a2a24..18c40e398ea5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c @@ -1285,7 +1285,6 @@ gv100_disp_init(struct nvkm_disp *disp) static const struct nvkm_disp_func gv100_disp = { - .dtor = nv50_disp_dtor, .oneinit = nv50_disp_oneinit, .init = gv100_disp_init, .fini = gv100_disp_fini, @@ -1311,5 +1310,5 @@ int gv100_disp_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_disp **pdisp) { - return nv50_disp_new_(&gv100_disp, device, type, inst, pdisp); + return nvkm_disp_new_(&gv100_disp, device, type, inst, pdisp); } |