xf86-video-intel: src/intel_display.c

Chris Wilson ickle at kemper.freedesktop.org
Thu Sep 9 16:10:45 PDT 2010


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

New commits:
commit 0515256490d5bcd55f85af83b84918d1bfe7f8f8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Sep 10 00:08:58 2010 +0100

    display: Free the EDID blob after we copy it to the output, not before.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_display.c b/src/intel_display.c
index e22c415..5d85baa 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -741,11 +741,12 @@ intel_output_attach_edid(xf86OutputPtr output)
 
 		if (mon && edid_blob->length > 128)
 			mon->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
-
-		drmModeFreePropertyBlob(edid_blob);
 	}
 
 	xf86OutputSetEDID(output, mon);
+
+	if (edid_blob)
+		drmModeFreePropertyBlob(edid_blob);
 }
 
 static DisplayModePtr


More information about the xorg-commit mailing list