drm/radeon/kms: additional lcd physical size and edid info
Subsystems (2)
cover drm/radeon/kms: additional lcd physical size and edid info
This set of patches pulls some additional information from the lcd info table in the vbios if available. The info includes:
an EDID block and physical size info. I don't have any systems that have these additional attributes, but a number of vbioses do have the info, so please test.
Alex
PATCH 1/2 drm/radeon/kms: use LCD physical size from vbios tables if available
Some systems have the LCD width and height in mm available in the LCD info table. Use this info if there is no EDID to provide it.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/radeon_atombios.c | 3 +++ drivers/gpu/drm/radeon/radeon_connectors.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/radeon_atombios.c +3 -0
@@ -1555,6 +1555,9 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(structif (misc &ATOM_DOUBLE_CLOCK_MODE ) lvds->native_mode.flags |=DRM_MODE_FLAG_DBLSCAN ; + lvds->native_mode.width_mm = lvds_info->info.sLCDTiming.usImageHSize; + lvds->native_mode.height_mm = lvds_info->info.sLCDTiming.usImageVSize; +/* set crtc values */ drm_mode_set_crtcinfo (&lvds->native_mode,CRTC_INTERLACE_HALVE_V );
drivers/gpu/drm/radeon/radeon_connectors.c +3 -0
@@ -472,6 +472,9 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)if (mode) { ret =1 ;drm_mode_probed_add (connector, mode); +/* add the width/height from vbios tables if available */ + connector->display_info.width_mm = mode->width_mm; + connector->display_info.height_mm = mode->height_mm;/* add scaled modes */ radeon_add_common_modes (encoder, connector); }
Signature · 1 line
1.7.1.1
PATCH 2/2 drm/radeon/kms: parse the extended LCD info block
In reply to Alex DeucherThis block may contain various additional LCD info such as physical size and a stored EDID.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/radeon_atombios.c | 53 ++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_combios.c | 3 +- drivers/gpu/drm/radeon/radeon_display.c | 14 ++++++-- drivers/gpu/drm/radeon/radeon_mode.h | 2 +- 4 files changed, 67 insertions(+), 5 deletions(-)
drivers/gpu/drm/radeon/radeon_atombios.c +53 -0
@@ -1570,6 +1570,59 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(structelse lvds->linkb = false; +/* parse the lcd record table */ +if (lvds_info->info.usModePatchTableOffset) { +ATOM_FAKE_EDID_PATCH_RECORD *fake_edid_record; +ATOM_PANEL_RESOLUTION_PATCH_RECORD *panel_res_record; +bool bad_record = false; +u8 *record = (u8 *)(mode_info->atom_context->bios + + data_offset + + lvds_info->info.usModePatchTableOffset); +while (*record !=ATOM_RECORD_END_TYPE ) { +switch (*record) { +case LCD_MODE_PATCH_RECORD_MODE_TYPE : + record +=sizeof (ATOM_PATCH_RECORD_MODE ); +break ; +case LCD_RTS_RECORD_TYPE : + record +=sizeof (ATOM_LCD_RTS_RECORD ); +break ; +case LCD_CAP_RECORD_TYPE : + record +=sizeof (ATOM_LCD_MODE_CONTROL_CAP ); +break ; +case LCD_FAKE_EDID_PATCH_RECORD_TYPE : + fake_edid_record = (ATOM_FAKE_EDID_PATCH_RECORD *)record; +if (fake_edid_record->ucFakeEDIDLength) { +struct edid *edid; +int edid_size = +max ((int )EDID_LENGTH , (int )fake_edid_record->ucFakeEDIDLength); + edid =kmalloc (edid_size,GFP_KERNEL ); +if (edid) { +memcpy ((u8 *)edid, (u8 *)&fake_edid_record->ucFakeEDIDString[0 ], + fake_edid_record->ucFakeEDIDLength); + +if (drm_edid_is_valid (edid)) + rdev->mode_info.bios_hardcoded_edid = edid; +else +kfree (edid); + } + } + record +=sizeof (ATOM_FAKE_EDID_PATCH_RECORD ); +break ; +case LCD_PANEL_RESOLUTION_RECORD_TYPE : + panel_res_record = (ATOM_PANEL_RESOLUTION_PATCH_RECORD *)record; + lvds->native_mode.width_mm = panel_res_record->usHSize; + lvds->native_mode.height_mm = panel_res_record->usVSize; + record +=sizeof (ATOM_PANEL_RESOLUTION_PATCH_RECORD ); +break ; +default : +DRM_ERROR ("Bad LCD record %d\n" , *record); + bad_record = true; +break ; + } +if (bad_record) +break ; + } + } }return lvds; }
drivers/gpu/drm/radeon/radeon_combios.c +2 -1
@@ -471,8 +471,9 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev)return true; } +/* this is used for atom LCDs as well */ struct edid * -radeon_combios_get_hardcoded_edid (struct radeon_device *rdev) +radeon_bios_get_hardcoded_edid (struct radeon_device *rdev) {if (rdev->mode_info.bios_hardcoded_edid)return rdev->mode_info.bios_hardcoded_edid;
drivers/gpu/drm/radeon/radeon_display.c +11 -3
@@ -742,9 +742,17 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)if (!radeon_connector->edid) { radeon_connector->edid =drm_get_edid (&radeon_connector->base, &radeon_connector->ddc_bus->adapter); } -/* some servers provide a hardcoded edid in rom for KVMs */ -if (!radeon_connector->edid) - radeon_connector->edid =radeon_combios_get_hardcoded_edid (rdev); + +if (!radeon_connector->edid) { +if (rdev->is_atom_bios) { +/* some laptops provide a hardcoded edid in rom for LCDs */ +if (((radeon_connector->base.connector_type ==DRM_MODE_CONNECTOR_LVDS ) || + (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP))) + radeon_connector->edid =radeon_bios_get_hardcoded_edid (rdev); + }else +/* some servers provide a hardcoded edid in rom for KVMs */ + radeon_connector->edid =radeon_bios_get_hardcoded_edid (rdev); + }if (radeon_connector->edid) {drm_mode_connector_update_edid_property (&radeon_connector->base, radeon_connector->edid); ret =drm_add_edid_modes (&radeon_connector->base, radeon_connector->edid);
drivers/gpu/drm/radeon/radeon_mode.h +1 -1
@@ -567,7 +567,7 @@ extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc,extern bool radeon_combios_check_hardcoded_edid (struct radeon_device *rdev);extern struct edid * -radeon_combios_get_hardcoded_edid (struct radeon_device *rdev); +radeon_bios_get_hardcoded_edid (struct radeon_device *rdev);extern bool radeon_atom_get_clock_info (struct drm_device *dev);extern bool radeon_combios_get_clock_info (struct drm_device *dev); extern struct radeon_encoder_atom_dig *
Signature · 1 line
1.7.1.1