diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2022-06-01 20:46:26 +1000 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2022-07-27 09:05:45 +1000 |
| commit | 0407b33fadcd7a5d31ba3c473cef95b2b418d8c4 (patch) | |
| tree | 4bc4239975d74ecca0787366fb26aa86d99504c1 /drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c | |
| parent | drm/nouveau/disp: clean up nvkm_outp constructors (diff) | |
| download | linux-dev-0407b33fadcd7a5d31ba3c473cef95b2b418d8c4.tar.xz linux-dev-0407b33fadcd7a5d31ba3c473cef95b2b418d8c4.zip | |
drm/nouveau/disp: collapse nv50_disp_func into nvkm_disp_func
Aside from a chicken-and-egg problem with a duplicate 'root' member,
this is a straight dump of function pointers from one struct into
another.
The left-over wrapping mess in >=nv50 structs will be fixed later.
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/nv04.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c index a12097db2c2a..454199cc88fb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c @@ -24,12 +24,6 @@ #include "priv.h" #include "head.h" -static const struct nvkm_disp_oclass * -nv04_disp_root(struct nvkm_disp *disp) -{ - return &nv04_disp_root_oclass; -} - static void nv04_disp_intr(struct nvkm_disp *disp) { @@ -60,7 +54,7 @@ nv04_disp_intr(struct nvkm_disp *disp) static const struct nvkm_disp_func nv04_disp = { .intr = nv04_disp_intr, - .root = nv04_disp_root, + .root = &nv04_disp_root_oclass, }; int |