File xf86-video-intel-commit-73aa23d.diff of Package xorg-x11-driver-video

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-video-intel-commit-73aa23d.diff of Package xorg-x11-driver-video (Revision 90583ce313298757158ce78b72643f2d)

Currently displaying revision 90583ce313298757158ce78b72643f2d , Show latest

commit 73aa23d9150121a4e4b70a78cab910acd164abf5
Author: Eric Anholt <eric@anholt.net>
Date:   Fri Dec 5 13:06:05 2008 -0800

DRI1: Update sarea (and other information) when CRTC configuration changes.
    
    Bug #14423.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>

diff --git a/src/i830_display.c b/src/i830_display.c
index 3139d40..ca55906 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1085,6 +1085,11 @@ i830_crtc_commit (xf86CrtcPtr crtc)
     /* Reenable FB compression if possible */
     if (i830_use_fb_compression(crtc))
 	i830_enable_fb_compression(crtc);
+
+#ifdef XF86DRI
+    /* Tell DRI1 the news about new output config */
+    i830_update_dri_buffers(crtc->scrn);
+#endif
 }
 
 void
diff --git a/src/i830_dri.c b/src/i830_dri.c
index b7ebd92..f61c564 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1387,9 +1387,6 @@ i830_update_dri_mappings(ScrnInfoPtr pScrn, drmI830Sarea *sarea)
 {
    I830Ptr pI830 = I830PTR(pScrn);
 
-   if (pI830->directRenderingType == DRI_DRI2)
-       return TRUE;
-
    if (!i830_do_addmap(pScrn, pI830->front_buffer, &sarea->front_handle,
 		       &sarea->front_size, &sarea->front_offset)) {
        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling DRI.\n");
@@ -1447,9 +1444,15 @@ Bool
 i830_update_dri_buffers(ScrnInfoPtr pScrn)
 {
    ScreenPtr pScreen = pScrn->pScreen;
-   drmI830Sarea *sarea = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen);
+   I830Ptr pI830 = I830PTR(pScrn);
+   drmI830Sarea *sarea;
    Bool success;
 
+   if (pI830->directRenderingType == DRI_DRI2)
+       return TRUE;
+
+   sarea = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen);
+
    success = i830_update_dri_mappings(pScrn, sarea);
    if (!success)
        return FALSE;

Places

File xf86-video-intel-commit-73aa23d.diff of Package xorg-x11-driver-video (Revision 90583ce313298757158ce78b72643f2d)

Places