Commit 852dfbde authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: use NVIDIA's headers for wimm update() 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 93701408

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

+5 −2
Original line number Diff line number Diff line
@@ -46,9 +46,12 @@ curs507a_space(struct nv50_wndw *wndw) 
static int

curs507a_update(struct nv50_wndw *wndw, u32 *interlock)

{

	struct nvif_object *user = &wndw->wimm.base.user;

	int ret = nvif_chan_wait(&wndw->wimm, 1);

	if (ret == 0)

		nvif_wr32(&wndw->wimm.base.user, 0x0080, 0x00000000);

	if (ret == 0) {

		NVIF_WR32(user, NV507A, UPDATE,

			  NVDEF(NV507A, UPDATE, INTERLOCK_WITH_CORE, DISABLE));

	}

	return ret;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -27,9 +27,10 @@ 
static int

cursc37a_update(struct nv50_wndw *wndw, u32 *interlock)

{

	struct nvif_object *user = &wndw->wimm.base.user;

	int ret = nvif_chan_wait(&wndw->wimm, 1);

	if (ret == 0)

		nvif_wr32(&wndw->wimm.base.user, 0x0200, 0x00000001);

		NVIF_WR32(user, NVC37A, UPDATE, 0x00000001);

	return ret;

}

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

+3 −3
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ wimmc37b_update(struct nv50_wndw *wndw, u32 *interlock) 
	if ((ret = PUSH_WAIT(push, 2)))

		return ret;



	PUSH_NVSQ(push, NVC37B, 0x0200, ((interlock[NV50_DISP_INTERLOCK_WNDW] &

					  wndw->interlock.data) ? 0x00000002 : 0x00000000) |

					0x00000001);

	PUSH_MTHD(push, NVC37B, UPDATE, 0x00000001 |

		  NVVAL(NVC37B, UPDATE, INTERLOCK_WITH_WINDOW,

			!!(interlock[NV50_DISP_INTERLOCK_WNDW] & wndw->interlock.data)));

	return PUSH_KICK(push);

}