xf86-video-intel: 2 commits - src/sna/kgem.c src/sna/sna_display.c

[Chris Wilson]

 src/sna/kgem.c        |    2 +-
 src/sna/sna_display.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit db01c9d627412f05f5e5448b5f4c1d3814d522fa
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Sep 8 07:13:47 2014 +0100

    sna: Fix backlight assertion after only hiding planes
    
    If we only hide the planes, we do not turn off any outputs and so can
    skip resetting the backlight entirely.
    
    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 46fd81f..a14f789 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -6310,7 +6310,8 @@ void sna_mode_reset(struct sna *sna)
 		struct sna_output *sna_output = to_sna_output(config->output[i]);
 
 		assert(sna_output != NULL);
-		assert(sna_output->dpms_mode == DPMSModeOff);
+		if (sna_output->dpms_mode != DPMSModeOff)
+			continue;
 
 		if (!sna_output->backlight.iface)
 			continue;
commit da0c9638d7c54b12990531fc478b2dd523ed4db9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Sep 8 07:07:08 2014 +0100

    sna: Fix an unreachable piece of code
    
    It doesn't do anything but the static analyzers at bay.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index aff0893..53cc578 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -3420,8 +3420,8 @@ static bool find_hang_state(struct kgem *kgem, char *path, int maxlen)
 	if (access(path, R_OK) == 0)
 		return true;
 
-	return false;
 	path[0] = '\0';
+	return false;
 }
 
 void kgem_throttle(struct kgem *kgem)