Commit 9f7ffb49 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ base507c_update(struct nv50_wndw *wndw, u32 *interlock) 
	if ((ret = PUSH_WAIT(push, 2)))

		return ret;



	PUSH_NVSQ(push, NV507C, 0x0080, interlock[NV50_DISP_INTERLOCK_CORE]);

	PUSH_MTHD(push, NV507C, UPDATE, interlock[NV50_DISP_INTERLOCK_CORE]);

	return PUSH_KICK(push);

}

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

+8 −6
Original line number Diff line number Diff line
@@ -279,12 +279,14 @@ wndwc37e_update(struct nv50_wndw *wndw, u32 *interlock) 
	if ((ret = PUSH_WAIT(push, 5)))

		return ret;



	PUSH_NVSQ(push, NVC37E, 0x0370,  interlock[NV50_DISP_INTERLOCK_CURS] << 1 |

	PUSH_MTHD(push, NVC37E, SET_INTERLOCK_FLAGS, interlock[NV50_DISP_INTERLOCK_CURS] << 1 |

						     interlock[NV50_DISP_INTERLOCK_CORE],

				0x0374,  interlock[NV50_DISP_INTERLOCK_WNDW]);

	PUSH_NVSQ(push, NVC37E, 0x0200,((interlock[NV50_DISP_INTERLOCK_WIMM] &

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

					 0x00000001);

				SET_WINDOW_INTERLOCK_FLAGS, interlock[NV50_DISP_INTERLOCK_WNDW]);



	PUSH_MTHD(push, NVC37E, UPDATE, 0x00000001 |

		  NVVAL(NVC37E, UPDATE, INTERLOCK_WITH_WIN_IMM,

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



	return PUSH_KICK(push);

}