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

uxa/dri: Confirm Drawable is still attached to an active pipe before flipping 

If we schedule a flip to happen on a far distant vblank, it is possible
for us to disable the pipes with a modeset, whilst maintaining the fb
size, or with a DPMS command. If the pipe is disabled and we still try
to flip, then we trigger an EINVAL error from the kernel.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-09-27 13:27:20 +01:00
parent eb66737854
commit edc5b7f741
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/intel_dri.c
View File

@ -455,7 +455,7 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
BoxPtr box;
BoxRec crtcbox;
int y1, y2;
int pipe = -1, event, load_scan_lines_pipe;
int event, load_scan_lines_pipe;
xf86CrtcPtr crtc;
Bool full_height = FALSE;
@ -467,7 +467,7 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
* buffer
*/
if (crtc != NULL && !crtc->rotatedData) {
pipe = intel_crtc_to_pipe(crtc);
int pipe = intel_crtc_to_pipe(crtc);
/*
* Make sure we don't wait for a scanline that will
@ -932,6 +932,9 @@ can_exchange(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back)
struct intel_pixmap *front_intel = intel_get_pixmap_private(front_pixmap);
struct intel_pixmap *back_intel = intel_get_pixmap_private(back_pixmap);
if (I830DRI2DrawablePipe(draw) < 0)
return FALSE;
if (!DRI2CanFlip(drawable))
return FALSE;