summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-07-21 12:32:10 -0700
committerCarl Worth <cworth@cworth.org>2009-08-25 16:14:28 -0700
commit154592a855e07889be5ffc8d63ef39ed424c61f6 (patch)
tree661c40ee460a2c8754f01475c7c714e99430063d
parentc6627f05c249879e548c0034c6a314d6d45a5f28 (diff)
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> (cherry picked from commit 6f3fc6b20f3daedab02e31f49678d4d2ff0fa7a3)
-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 8c919f9e..814743b3 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -638,8 +638,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,