Commit 6cc6e08d authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/kms: add support for GB20x 



Adds basic support for the new display classes available on GB20x GPUs.

Most of the changes here deal with HW method moves, with the only other
change of note being tweaks to skip allocation of CTXDMA objects, which
aren't required on Blackwell display.

Signed-off-by: default avatarBen Skeggs <bskeggs@nvidia.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarTimur Tabi <ttabi@nvidia.com>
Tested-by: default avatarTimur Tabi <ttabi@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f0ddbb1e

drivers/gpu/drm/nouveau/dispnv50/Kbuild

+4 −0
Original line number Diff line number Diff line
@@ -9,11 +9,13 @@ nouveau-y += dispnv50/core907d.o 
nouveau-y += dispnv50/core917d.o

nouveau-y += dispnv50/corec37d.o

nouveau-y += dispnv50/corec57d.o

nouveau-y += dispnv50/coreca7d.o



nouveau-$(CONFIG_DEBUG_FS) += dispnv50/crc.o

nouveau-$(CONFIG_DEBUG_FS) += dispnv50/crc907d.o

nouveau-$(CONFIG_DEBUG_FS) += dispnv50/crcc37d.o

nouveau-$(CONFIG_DEBUG_FS) += dispnv50/crcc57d.o

nouveau-$(CONFIG_DEBUG_FS) += dispnv50/crcca7d.o



nouveau-y += dispnv50/dac507d.o

nouveau-y += dispnv50/dac907d.o
@@ -31,6 +33,7 @@ nouveau-y += dispnv50/head907d.o 
nouveau-y += dispnv50/head917d.o

nouveau-y += dispnv50/headc37d.o

nouveau-y += dispnv50/headc57d.o

nouveau-y += dispnv50/headca7d.o



nouveau-y += dispnv50/wimm.o

nouveau-y += dispnv50/wimmc37b.o
@@ -39,6 +42,7 @@ nouveau-y += dispnv50/wndw.o 
nouveau-y += dispnv50/wndwc37e.o

nouveau-y += dispnv50/wndwc57e.o

nouveau-y += dispnv50/wndwc67e.o

nouveau-y += dispnv50/wndwca7e.o



nouveau-y += dispnv50/base.o

nouveau-y += dispnv50/base507c.o

drivers/gpu/drm/nouveau/dispnv50/core.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ nv50_core_new(struct nouveau_drm *drm, struct nv50_core **pcore) 
		int version;

		int (*new)(struct nouveau_drm *, s32, struct nv50_core **);

	} cores[] = {

		{ GB202_DISP_CORE_CHANNEL_DMA, 0, coreca7d_new },

		{ AD102_DISP_CORE_CHANNEL_DMA, 0, corec57d_new },

		{ GA102_DISP_CORE_CHANNEL_DMA, 0, corec57d_new },

		{ TU102_DISP_CORE_CHANNEL_DMA, 0, corec57d_new },

drivers/gpu/drm/nouveau/dispnv50/core.h

+6 −0
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@ 


struct nv50_core {

	const struct nv50_core_func *func;

	struct nv50_disp *disp;



	struct nv50_dmac chan;



	bool assign_windows;

};
@@ -18,6 +21,7 @@ struct nv50_core_func { 
	int (*init)(struct nv50_core *);

	void (*ntfy_init)(struct nouveau_bo *, u32 offset);

	int (*caps_init)(struct nouveau_drm *, struct nv50_disp *);

	u32 caps_class;

	int (*ntfy_wait_done)(struct nouveau_bo *, u32 offset,

			      struct nvif_device *);

	int (*update)(struct nv50_core *, u32 *interlock, bool ntfy);
@@ -70,4 +74,6 @@ int corec37d_wndw_owner(struct nv50_core *); 
extern const struct nv50_outp_func sorc37d;



int corec57d_new(struct nouveau_drm *, s32, struct nv50_core **);



int coreca7d_new(struct nouveau_drm *, s32, struct nv50_core **);

#endif

drivers/gpu/drm/nouveau/dispnv50/core507d.c

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ core507d_new_(const struct nv50_core_func *func, struct nouveau_drm *drm, 
	if (!(core = *pcore = kzalloc(sizeof(*core), GFP_KERNEL)))

		return -ENOMEM;

	core->func = func;

	core->disp = disp;



	ret = nv50_dmac_create(drm,

			       &oclass, 0, &args, sizeof(args),

drivers/gpu/drm/nouveau/dispnv50/corec37d.c

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int corec37d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp) 
	int ret;



	ret = nvif_object_ctor(&disp->disp->object, "dispCaps", 0,

			       GV100_DISP_CAPS, NULL, 0, &disp->caps);

			       disp->core->func->caps_class, NULL, 0, &disp->caps);

	if (ret) {

		NV_ERROR(drm,

			 "Failed to init notifier caps region: %d\n",
@@ -162,6 +162,7 @@ corec37d = { 
	.init = corec37d_init,

	.ntfy_init = corec37d_ntfy_init,

	.caps_init = corec37d_caps_init,

	.caps_class = GV100_DISP_CAPS,

	.ntfy_wait_done = corec37d_ntfy_wait_done,

	.update = corec37d_update,

	.wndw.owner = corec37d_wndw_owner,