xf86-video-ati: Branch 'master'

[Adam Jackson]

 src/drmmode_display.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 809cacbc23ab37aa7952665f9b2e37c03a34f173
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Oct 18 12:32:11 2010 -0400

    kms: Let the server know if we got more than 1 EDID block
    
    Otherwise things like xf86MonitorIsHDMI() won't work right.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index a6038b2..baadec1 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -610,6 +610,7 @@ drmmode_output_get_modes(xf86OutputPtr output)
 	int i;
 	DisplayModePtr Modes = NULL, Mode;
 	drmModePropertyPtr props;
+	xf86MonPtr mon = NULL;
 
 	/* look for an EDID property */
 	for (i = 0; i < koutput->count_props; i++) {
@@ -624,10 +625,13 @@ drmmode_output_get_modes(xf86OutputPtr output)
 		}
 	}
 
-	if (drmmode_output->edid_blob)
-		xf86OutputSetEDID(output, xf86InterpretEDID(output->scrn->scrnIndex, drmmode_output->edid_blob->data));
-	else
-		xf86OutputSetEDID(output, xf86InterpretEDID(output->scrn->scrnIndex, NULL));
+	if (drmmode_output->edid_blob) {
+		mon = xf86InterpretEDID(output->scrn->scrnIndex,
+					drmmode_output->edid_blob->data);
+		if (mon && drmmode_output->edid_blob->length > 128)
+			mon->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
+	}
+	xf86OutputSetEDID(output, mon);
 
 	/* modes should already be available */
 	for (i = 0; i < koutput->count_modes; i++) {