diff options
| author | Adam Jackson <ajax@redhat.com> | 2010-10-18 12:32:11 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2010-10-18 12:32:11 -0400 |
| commit | 809cacbc23ab37aa7952665f9b2e37c03a34f173 (patch) | |
| tree | c6355ccdfd8e6d6675ab09b47ac6c042de57c278 | |
| parent | 042037e485396981cf4a420c247104ba5d016ca0 (diff) | |
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@redhat.com>
| -rw-r--r-- | src/drmmode_display.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index a6038b23..baadec1b 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++) { |