Commit f266fdc7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-5.2' of git://github.com/skeggsb/linux into drm-next 



Mostly fixes for a number of modesetting-related issues that have been
reported, as well as initial support for TU117 modesetting.  TU116
also exists these days, but is not officially supported, as I don't
have HW yet to verify against.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv77U7_bWYy9CUVGU8zAE0NZcKOLp6kUgppgq9HPd0tBnw@mail.gmail.com
parents c01ad0fe c4a52d66

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct nv50_disp_interlock { 
		NV50_DISP_INTERLOCK__SIZE

	} type;

	u32 data;

	u32 wimm;

};



void corec37d_ntfy_init(struct nouveau_bo *, u32);

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

+2 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ nv50_head_atomic_check(struct drm_crtc *crtc, struct drm_crtc_state *state) 
			asyh->set.or = head->func->or != NULL;

		}



		if (asyh->state.mode_changed)

		if (asyh->state.mode_changed || asyh->state.connectors_changed)

			nv50_head_atomic_check_mode(head, asyh);



		if (asyh->state.color_mgmt_changed ||
@@ -413,6 +413,7 @@ nv50_head_atomic_duplicate_state(struct drm_crtc *crtc) 
	asyh->ovly = armh->ovly;

	asyh->dither = armh->dither;

	asyh->procamp = armh->procamp;

	asyh->or = armh->or;

	asyh->dp = armh->dp;

	asyh->clr.mask = 0;

	asyh->set.mask = 0;

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

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ wimmc37b_init_(const struct nv50_wimm_func *func, struct nouveau_drm *drm, 
		return ret;

	}



	wndw->interlock.wimm = wndw->interlock.data;

	wndw->immd = func;

	return 0;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ void 
nv50_wndw_flush_set(struct nv50_wndw *wndw, u32 *interlock,

		    struct nv50_wndw_atom *asyw)

{

	if (interlock) {

	if (interlock[NV50_DISP_INTERLOCK_CORE]) {

		asyw->image.mode = 0;

		asyw->image.interval = 1;

	}
@@ -149,7 +149,7 @@ nv50_wndw_flush_set(struct nv50_wndw *wndw, u32 *interlock, 
	if (asyw->set.point) {

		if (asyw->set.point = false, asyw->set.mask)

			interlock[wndw->interlock.type] |= wndw->interlock.data;

		interlock[NV50_DISP_INTERLOCK_WIMM] |= wndw->interlock.data;

		interlock[NV50_DISP_INTERLOCK_WIMM] |= wndw->interlock.wimm;



		wndw->immd->point(wndw, asyw);

		wndw->immd->update(wndw, interlock);

drivers/gpu/drm/nouveau/nouveau_drm.c

+2 −1
Original line number Diff line number Diff line
@@ -631,7 +631,8 @@ static int nouveau_drm_probe(struct pci_dev *pdev, 
	/* We need to check that the chipset is supported before booting

	 * fbdev off the hardware, as there's no way to put it back.

	 */

	ret = nvkm_device_pci_new(pdev, NULL, "error", true, false, 0, &device);

	ret = nvkm_device_pci_new(pdev, nouveau_config, "error",

				  true, false, 0, &device);

	if (ret)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE