Commit 76cfab9c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-5.8' of git://github.com/skeggsb/linux into drm-fixes 



- SVM fixes
- display fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ <CACAvsv5i-dc0Onbk8FWzd-PTgXHHWi6jcE3O0hVx8+V5qEOeqg@mail.gmail.com
parents a088eb0f ed710a6e

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

+3 −0
Original line number Diff line number Diff line
@@ -601,6 +601,9 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc) 
				(0x0100 << nv_crtc->index),

	};



	if (!nv_encoder->audio)

		return;



	nv_encoder->audio = false;

	nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));

drivers/gpu/drm/nouveau/nouveau_dmem.c

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static unsigned long nouveau_dmem_migrate_copy_one(struct nouveau_drm *drm, 
					 DMA_BIDIRECTIONAL);

		if (dma_mapping_error(dev, *dma_addr))

			goto out_free_page;

		if (drm->dmem->migrate.copy_func(drm, page_size(spage),

		if (drm->dmem->migrate.copy_func(drm, 1,

			NOUVEAU_APER_VRAM, paddr, NOUVEAU_APER_HOST, *dma_addr))

			goto out_dma_unmap;

	} else {

drivers/gpu/drm/nouveau/nouveau_svm.c

+1 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ static int nouveau_range_fault(struct nouveau_svmm *svmm, 
		.end = notifier->notifier.interval_tree.last + 1,

		.pfn_flags_mask = HMM_PFN_REQ_FAULT | HMM_PFN_REQ_WRITE,

		.hmm_pfns = hmm_pfns,

		.dev_private_owner = drm->dev,

	};

	struct mm_struct *mm = notifier->notifier.mm;

	int ret;

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c

+2 −2
Original line number Diff line number Diff line
@@ -118,10 +118,10 @@ g94_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry, 
		if (retries)

			udelay(400);



		/* transaction request, wait up to 1ms for it to complete */

		/* transaction request, wait up to 2ms for it to complete */

		nvkm_wr32(device, 0x00e4e4 + base, 0x00010000 | ctrl);



		timeout = 1000;

		timeout = 2000;

		do {

			ctrl = nvkm_rd32(device, 0x00e4e4 + base);

			udelay(1);

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c

+2 −2
Original line number Diff line number Diff line
@@ -118,10 +118,10 @@ gm200_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry, 
		if (retries)

			udelay(400);



		/* transaction request, wait up to 1ms for it to complete */

		/* transaction request, wait up to 2ms for it to complete */

		nvkm_wr32(device, 0x00d954 + base, 0x00010000 | ctrl);



		timeout = 1000;

		timeout = 2000;

		do {

			ctrl = nvkm_rd32(device, 0x00d954 + base);

			udelay(1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE