Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58e04e3e authored by Ben Skeggs's avatar Ben Skeggs Committed by Greg Kroah-Hartman
Browse files

drm/nouveau/kms/nv50-: fix case where notifier buffer is at offset 0 



[ Upstream commit caeb6ab899c3d36a74cda6e299c6e1c9c4e2a22e ]

VRAM offset 0 is a valid address, triggered on GA102.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d27d6aae

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

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ nv50_dmac_destroy(struct nv50_dmac *dmac) 


int

nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp,

		 const s32 *oclass, u8 head, void *data, u32 size, u64 syncbuf,

		 const s32 *oclass, u8 head, void *data, u32 size, s64 syncbuf,

		 struct nv50_dmac *dmac)

{

	struct nouveau_cli *cli = (void *)device->object.client;
@@ -166,7 +166,7 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp, 
	if (ret)

		return ret;



	if (!syncbuf)

	if (syncbuf < 0)

		return 0;



	ret = nvif_object_init(&dmac->base.user, 0xf0000000, NV_DMA_IN_MEMORY,

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct nv50_dmac { 


int nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp,

		     const s32 *oclass, u8 head, void *data, u32 size,

		     u64 syncbuf, struct nv50_dmac *dmac);

		     s64 syncbuf, struct nv50_dmac *dmac);

void nv50_dmac_destroy(struct nv50_dmac *);



u32 *evo_wait(struct nv50_dmac *, int nr);

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ wimmc37b_init_(const struct nv50_wimm_func *func, struct nouveau_drm *drm, 
	int ret;



	ret = nv50_dmac_create(&drm->client.device, &disp->disp->object,

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

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

			       &wndw->wimm);

	if (ret) {

		NV_ERROR(drm, "wimm%04x allocation failed: %d\n", oclass, ret);