xf86-video-intel: 2 commits - src/sna/sna_accel.c src/sna/sna_display_fake.c

[Chris Wilson]

 src/sna/sna_accel.c        |    2 +-
 src/sna/sna_display_fake.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 0b2e11ab3c81e74d37180aeb2bb1fce9bcd3870c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Sep 6 11:12:28 2013 +0100

    sna: Rechain up SetWindowPixmap upon ScreenPixmap change
    
    Fixes regression from
    commit d2f19d5a1f4d1c9521fb4801c9fb649d19746150 [2.99.901]
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Tue Sep 3 19:05:41 2013 +0100
    
        sna: Tidy walking the window tree for updating our pixmaps
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 4c8d700..33acb30 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -15221,7 +15221,7 @@ sna_visit_set_window_pixmap(WindowPtr window, pointer data)
     struct sna_visit_set_pixmap_window *visit = data;
 
     if (sna_get_window_pixmap(window) == visit->old) {
-	    sna_set_window_pixmap(window, visit->new);
+	    window->drawable.pScreen->SetWindowPixmap(window, visit->new);
 	    return WT_WALKCHILDREN;
     }
 
commit 1b1ac5193ead52dc32bf31f851d04600ea81ab1d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Sep 6 11:11:47 2013 +0100

    sna: Include some DBG for the virtual output detection
    
    So we can see it in the logs along with the regular outputs.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display_fake.c b/src/sna/sna_display_fake.c
index 06cd714..fd1419b 100644
--- a/src/sna/sna_display_fake.c
+++ b/src/sna/sna_display_fake.c
@@ -130,6 +130,10 @@ sna_output_dpms(xf86OutputPtr output, int dpms)
 static xf86OutputStatus
 sna_output_detect(xf86OutputPtr output)
 {
+	DBG(("%s(%s) has user modes? %d\n",
+	     __FUNCTION__, output->name,
+	     output->randr_output && output->randr_output->numUserModes));
+
 	if (output->randr_output && output->randr_output->numUserModes) {
 		xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(output->scrn);