summaryrefslogtreecommitdiff
authorKeith Packard <keithp@keithp.com>2009-07-21 19:32:10 (GMT)
committer Keith Packard <keithp@keithp.com>2009-07-21 19:38:28 (GMT)
commit6f3fc6b20f3daedab02e31f49678d4d2ff0fa7a3 (patch) (side-by-side diff)
treeed72efa28c4e22e013d8e66f28b183581b286909
parent840a787a191b31ece5068e10daed04bee70bb1a2 (diff)
downloadxf86-video-intel-6f3fc6b20f3daedab02e31f49678d4d2ff0fa7a3.zip
xf86-video-intel-6f3fc6b20f3daedab02e31f49678d4d2ff0fa7a3.tar.gz
drmmode_output_get_modes: Replace existing EDID property blob with new one
This synchronizes the X EDID data with the kernel EDID data each time the kernel data may have changed. Otherwise, X ends up stuck with the first EDID data it sees, failing to accomodate to different monitors. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/drmmode_display.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index df10fb5..bb239ed 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -641,8 +641,7 @@ drmmode_output_get_modes(xf86OutputPtr output)
if (!props || !(props->flags & DRM_MODE_PROP_BLOB))
continue;
- if (!strcmp(props->name, "EDID") &&
- drmmode_output->edid_blob == NULL) {
+ if (!strcmp(props->name, "EDID")) {
drmModeFreePropertyBlob(drmmode_output->edid_blob);
drmmode_output->edid_blob =
drmModeGetPropertyBlob(drmmode->fd,