xf86-video-intel: src/intel_dri.c

Chris Wilson ickle at kemper.freedesktop.org
Thu Sep 27 06:56:34 PDT 2012


 src/intel_dri.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cb0b72c4fbb7b1bc941522d8679fef856f2f8936
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 27 14:53:46 2012 +0100

    uxa: Fixup the last couple of commits after realising I didn't have uxa enabled
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_dri.c b/src/intel_dri.c
index b0e4830..64cb567 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -924,7 +924,8 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel,
 static Bool
 can_exchange(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back)
 {
-	struct intel_screen_private *intel = intel_get_screen_private(xf86ScreenToScrn(drawable->pScreen));
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(drawable->pScreen);
+	struct intel_screen_private *intel = intel_get_screen_private(pScrn);
 	I830DRI2BufferPrivatePtr front_priv = front->driverPrivate;
 	I830DRI2BufferPrivatePtr back_priv = back->driverPrivate;
 	PixmapPtr front_pixmap = front_priv->pixmap;
@@ -935,7 +936,7 @@ can_exchange(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back)
 	if (!pScrn->vtSema)
 		return FALSE;
 
-	if (I830DRI2DrawablePipe(draw) < 0)
+	if (I830DRI2DrawablePipe(drawable) < 0)
 		return FALSE;
 
 	if (!DRI2CanFlip(drawable))


More information about the xorg-commit mailing list