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

[Chris Wilson]

 src/sna/sna_accel.c        |    6 ++++--
 src/sna/sna_display_fake.c |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 529db4d5edf396757f4f10a2b3aac55ad7e0bbc1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Sep 2 13:04:49 2013 +0100

    sna: Check for output->randr_output before dereferencing
    
    As we may call the ->detect() routines during the fallback initial
    probing, we need to handle the case where the output callbacks are
    called before RandR is setup.
    
    Regresion from
    commit 8ecb758697af42e8e68edee0d1945986470a9c04
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Sat Aug 31 19:44:50 2013 +0100
    
        sna: Expand the array of fake outputs if the last is used
    
    Reported-by: Andreas Reis <andreas.reis at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68843
    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 3daa793..06cd714 100644
--- a/src/sna/sna_display_fake.c
+++ b/src/sna/sna_display_fake.c
@@ -130,7 +130,7 @@ sna_output_dpms(xf86OutputPtr output, int dpms)
 static xf86OutputStatus
 sna_output_detect(xf86OutputPtr output)
 {
-	if (output->randr_output->numUserModes) {
+	if (output->randr_output && output->randr_output->numUserModes) {
 		xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(output->scrn);
 
 		if (xf86_config->output[xf86_config->num_output-1] == output)
commit 9ac895fccba72c6d4c0e754ab5298ece7dc8632d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Sep 2 13:03:33 2013 +0100

    sna: Process winSize region
    
    Sometimes the window size is not a simple box, but a full region. In
    which case we do need to process it and not just assert that it is a
    box!
    
    Reported-by: Jiri Slaby <jirislaby at gmai.com>
    References: https://bugs.freedesktop.org/show_bug.cgi?id=47597
    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 9db3f27..2205b33 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -5641,8 +5641,10 @@ sna_do_copy(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 		if (gc->subWindowMode == IncludeInferiors) {
 			DBG(("%s: window -- include inferiors\n", __FUNCTION__));
 
-			assert(!w->winSize.data);
-			box_intersect(&region.extents, &w->winSize.extents);
+			if (w->winSize.data)
+				RegionIntersect(&region, &region, &w->winSize);
+			else
+				box_intersect(&region.extents, &w->winSize.extents);
 			clip = &w->borderClip;
 		} else {
 			DBG(("%s: window -- clip by children\n", __FUNCTION__));