Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uxa: Flush batch immediately after queuing a WAIT_FOR_EVENT 

We still encounter hangs with kernel-3.5 with the culprit being a wait
on a disabled pipe. As we thoroughly check before that the pipe is still
disabled and flush before a modeset, the only possibility that remains
is that DPMS is disabling the pipe before we submit. Close that race by
always submitting the batch immediately after a WAIT_FOR_EVENT.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-09-05 12:33:08 +01:00
parent 6a14235477
commit 6211d0914e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel_dri.c
View File

@ -540,6 +540,11 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
0, 0);
FreeScratchGC(gc);
/* And make sure the WAIT_FOR_EVENT is queued before any
* modesetting/dpms operations on the pipe.
*/
intel_batch_submit(scrn);
}
#if DRI2INFOREC_VERSION >= 4

5
src/intel_video.c
View File

@ -1585,6 +1585,11 @@ I830PutImageTextured(ScrnInfoPtr scrn,
intel_get_screen_private(scrn)->needs_flush = TRUE;
DamageDamageRegion(drawable, clipBoxes);
/* And make sure the WAIT_FOR_EVENT is queued before any
* modesetting/dpms operations on the pipe.
*/
intel_batch_submit(scrn);
return Success;
}