xf86-video-intel: 3 commits - src/sna/sna_display.c src/sna/sna_render.c

[Chris Wilson]

 src/sna/sna_display.c |    3 ++-
 src/sna/sna_render.c  |    4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 484b072072c8297a87940c9e32097923f0a77c8f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 25 12:22:47 2012 +0100

    sna: Add 'gmux_backlight' to list of known devices for backwards compatability
    
    Reported-by: Austin Lund <austin.lund at gmail.com>
    References: https://bugs.freedesktop.org/show_bug.cgi?id=52423
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index ebecd21..a908596 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -292,6 +292,7 @@ static void
 sna_output_backlight_init(xf86OutputPtr output)
 {
 	static const char *known_interfaces[] = {
+		"gmux_backlight",
 		"asus-laptop",
 		"asus-nb-wmi",
 		"eeepc",
commit 0ab6d7a50d37cf4454577cb8c333d4b8683aa054
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 25 12:20:36 2012 +0100

    sna: Prefer platform backlight devices over firmware
    
    This is in contrast to libbacklight but closer to our original code as
    we prefer a known custom backlight controller over the ACPI interfaces.
    As only the ACPI interfaces are marked as firmware, and the custom
    backlight controllers as platform, we therefore need to prefer platform
    backlight devices.
    
    Reported-by: Austin Lund <austin.lund at gmail.com>
    References: https://bugs.freedesktop.org/show_bug.cgi?id=52423
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index b31f08d..ebecd21 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -282,8 +282,8 @@ sna_output_backlight_get_max(xf86OutputPtr output)
 }
 
 enum {
-	FIRMWARE,
 	PLATFORM,
+	FIRMWARE,
 	RAW,
 	NAMED,
 };
commit b6d82ab07661aba98963f239f9501b50c3910962
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 25 10:40:07 2012 +0100

    sna: Reduce ping-pong for Composite with render disabled
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 17ac814..9d4b926 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -84,6 +84,10 @@ no_render_composite(struct sna *sna,
 {
 	DBG(("%s (op=%d, mask? %d)\n", __FUNCTION__, op, mask != NULL));
 
+	if (!is_gpu(dst->pDrawable) &&
+	    (src->pDrawable == NULL || !is_gpu(src->pDrawable)))
+		return false;
+
 	if (mask == NULL &&
 	    sna_blt_composite(sna,
 			      op, src, dst,