Commit 0407b33f authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

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: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 412dfcf3

drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c

+2 −3
Original line number Diff line number Diff line
@@ -197,9 +197,8 @@ nvkm_disp_class_get(struct nvkm_oclass *oclass, int index, 
{

	struct nvkm_disp *disp = nvkm_disp(oclass->engine);

	if (index == 0) {

		const struct nvkm_disp_oclass *root = disp->func->root(disp);

		oclass->base = root->base;

		oclass->engn = root;

		oclass->base = disp->func->root->base;

		oclass->engn = disp->func->root;

		*class = &nvkm_disp_sclass;

		return 0;

	}

drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c

+9 −4
Original line number Diff line number Diff line
@@ -26,11 +26,16 @@ 
#include "ior.h"

#include "rootnv50.h"



static const struct nv50_disp_func

static const struct nvkm_disp_func

g84_disp = {

	.init = nv50_disp_init,

	.fini = nv50_disp_fini,

	.intr = nv50_disp_intr,

	.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,

	.super = nv50_disp_super,

	.root = &g84_disp_root_oclass,

drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c

+9 −4
Original line number Diff line number Diff line
@@ -26,11 +26,16 @@ 
#include "ior.h"

#include "rootnv50.h"



static const struct nv50_disp_func

static const struct nvkm_disp_func

g94_disp = {

	.init = nv50_disp_init,

	.fini = nv50_disp_fini,

	.intr = nv50_disp_intr,

	.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,

	.super = nv50_disp_super,

	.root = &g94_disp_root_oclass,

drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c

+9 −4
Original line number Diff line number Diff line
@@ -25,11 +25,16 @@ 
#include "channv50.h"

#include "rootnv50.h"



static const struct nv50_disp_func

static const struct nvkm_disp_func

ga102_disp = {

	.init = tu102_disp_init,

	.fini = gv100_disp_fini,

	.intr = gv100_disp_intr,

	.dtor = nv50_disp_dtor_,

	.oneinit = nv50_disp_oneinit_,

	.init = nv50_disp_init_,

	.fini = nv50_disp_fini_,

	.intr = nv50_disp_intr_,

	.init_ = tu102_disp_init,

	.fini_ = gv100_disp_fini,

	.intr_ = gv100_disp_intr,

	.uevent = &gv100_disp_chan_uevent,

	.super = gv100_disp_super,

	.root = &ga102_disp_root_oclass,

drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c

+9 −4
Original line number Diff line number Diff line
@@ -251,11 +251,16 @@ gf119_disp_init(struct nv50_disp *disp) 
	return 0;

}



static const struct nv50_disp_func

static const struct nvkm_disp_func

gf119_disp = {

	.init = gf119_disp_init,

	.fini = gf119_disp_fini,

	.intr = gf119_disp_intr,

	.dtor = nv50_disp_dtor_,

	.oneinit = nv50_disp_oneinit_,

	.init = nv50_disp_init_,

	.fini = nv50_disp_fini_,

	.intr = nv50_disp_intr_,

	.init_ = gf119_disp_init,

	.fini_ = gf119_disp_fini,

	.intr_ = gf119_disp_intr,

	.intr_error = gf119_disp_intr_error,

	.uevent = &gf119_disp_chan_uevent,

	.super = gf119_disp_super,