diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2022-06-01 12:46:26 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-07-27 01:05:45 +0200 |
| commit | 92fba5d3c8f5b757c4e3fdc89afe76a8f6c4da68 (patch) | |
| tree | 28eab941dd7b34c8044060a2830cc36dc1ebe51c /drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c | |
| parent | drm/nouveau/disp: collapse nv50_disp_func into nvkm_disp_func (diff) | |
| download | linux-92fba5d3c8f5b757c4e3fdc89afe76a8f6c4da68.tar.xz linux-92fba5d3c8f5b757c4e3fdc89afe76a8f6c4da68.zip | |
drm/nouveau/disp: collapse nv50_disp into nvkm_disp
Dump of one struct's members into another, with a couple of list
renames because of collisions.
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/mcp77.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c index d92921198f47..bbf1a8f28f59 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c @@ -19,7 +19,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nv50.h" +#include "priv.h" #include "head.h" #include "ior.h" #include "rootnv50.h" @@ -28,19 +28,16 @@ static const struct nvkm_disp_func mcp77_disp = { .dtor = nv50_disp_dtor_, .oneinit = nv50_disp_oneinit_, - .init = nv50_disp_init_, - .fini = nv50_disp_fini_, - .intr = nv50_disp_intr_, - .init_ = nv50_disp_init, - .fini_ = nv50_disp_fini, - .intr_ = nv50_disp_intr, - .uevent = &nv50_disp_chan_uevent, + .init = nv50_disp_init, + .fini = nv50_disp_fini, + .intr = nv50_disp_intr, .super = nv50_disp_super, - .root = &g94_disp_root_oclass, + .uevent = &nv50_disp_chan_uevent, .head = { .cnt = nv50_head_cnt, .new = nv50_head_new }, .dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new }, .sor = { .cnt = g94_sor_cnt, .new = mcp77_sor_new }, .pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new }, + .root = &g94_disp_root_oclass, }; int |