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

[Chris Wilson]

 src/sna/sna_display.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 97b443f589fb62ba060f09a371be273549f524d0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 18 11:44:53 2013 +0100

    sna: Fix off-by-one in computation of valid CRTC mask
    
    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 7b1ef88..7b1684f 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2612,7 +2612,7 @@ sna_mode_compute_possible_outputs(ScrnInfoPtr scrn)
 	assert(config->num_output < 32);
 	assert(config->num_crtc < 32);
 
-	crtc_mask = (1 << (config->num_crtc + 1)) - 1;
+	crtc_mask = (1 << config->num_crtc) - 1;
 
 	/* Convert from encoder numbering to output numbering */
 	for (i = 0; i < config->num_output; i++) {
commit efffc42f227131792920391f9a87238743b2c490
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 18 11:43:24 2013 +0100

    sna: Disable same-edid detection
    
    The kernel is quite able to return the same id for new edid. :(
    
    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 0579503..7b1ef88 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1894,8 +1894,7 @@ sna_output_attach_edid(xf86OutputPtr output)
 	blob.blob_id = sna_output->prop_values[sna_output->edid_idx];
 	DBG(("%s: attaching EDID id=%d, current=%d\n",
 	     __FUNCTION__, blob.blob_id, sna_output->edid_blob_id));
-
-	if (blob.blob_id == sna_output->edid_blob_id) {
+	if (blob.blob_id == sna_output->edid_blob_id && 0) { /* sigh */
 		if (output->MonInfo) {
 			/* XXX the property keeps on disappearing... */
 			RRChangeOutputProperty(output->randr_output,