AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i915tex: Do not wait for pending flips on both pipes at the same time.

Browse Source 
The MI_WAIT_FOR_EVENT instruction does not support waiting for several events
at once, so this should fix the lockups with page flipping when both pipes are
enabled.
This commit is contained in:
Michel Dänzer
2007-03-09 17:41:04 +01:00
parent fb3410297b
commit 81536789d2
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i915tex/intel_buffers.c
+4 -9
View File
@@ -662,20 +662,15 @@ intel_wait_flips(struct intel_context *intel, GLuint batch_flags)
BUFFER_BACK_LEFT);
if (intel_fb->Base.Name == 0 && intel_rb->pf_pending == intel_fb->pf_seq) {
GLuint mi_wait = MI_WAIT_FOR_EVENT;
GLint pf_pipes = intel_fb->pf_pipes;
BATCH_LOCALS;
if (pf_pipes & 0x1)
mi_wait |= MI_WAIT_FOR_PLANE_A_FLIP;
if (pf_pipes & 0x2)
mi_wait |= MI_WAIT_FOR_PLANE_B_FLIP;
/* Wait for pending flips to take effect */
BEGIN_BATCH(2, batch_flags);
OUT_BATCH(mi_wait);
OUT_BATCH(0);
OUT_BATCH(pf_pipes & 0x1 ? (MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PLANE_A_FLIP)
: 0);
OUT_BATCH(pf_pipes & 0x2 ? (MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PLANE_B_FLIP)
: 0);
ADVANCE_BATCH();
intel_rb->pf_pending--;