summaryrefslogtreecommitdiff
path: root/src/radeon_output.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2008-11-24 15:52:05 -0500
committerAlex Deucher <alexdeucher@gmail.com>2008-11-24 15:52:05 -0500
commitd7a03e93372b17d642b42f5490464616ae7c99c1 (patch)
tree77eda62d0e45554babe9d52bdeb0c0b650c99d5f /src/radeon_output.c
parent3858e31fa9d77d52a5cabb02f53f06385eab40f7 (diff)
Get hardcoded edid from the bios for servers that support it
should fix bug 11300
Diffstat (limited to 'src/radeon_output.c')
-rw-r--r--src/radeon_output.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 8c794fb3..bff65ad1 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -229,7 +229,14 @@ radeon_ddc_connected(xf86OutputPtr output)
(radeon_output->ddc_i2c.mask_clk_reg == RADEON_GPIO_VGA_DDC) &&
info->IsAtomBios)
MonInfo = radeon_atom_get_edid(output);
- else {
+ else if (info->get_hardcoded_edid_from_bios) {
+ MonInfo = RADEONGetHardCodedEDIDFromBIOS(output);
+ if (MonInfo == NULL) {
+ RADEONI2CDoLock(output, TRUE);
+ MonInfo = xf86OutputGetEDID(output, radeon_output->pI2CBus);
+ RADEONI2CDoLock(output, FALSE);
+ }
+ } else {
RADEONI2CDoLock(output, TRUE);
MonInfo = xf86OutputGetEDID(output, radeon_output->pI2CBus);
RADEONI2CDoLock(output, FALSE);