Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c324acd5 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: parse the extended LCD info block 



This block may contain various additional LCD info such
as physical size and a stored EDID.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7a868e18

drivers/gpu/drm/radeon/radeon_atombios.c

+53 −0
Original line number Diff line number Diff line
@@ -1515,6 +1515,59 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct 
		else

			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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -679,9 +679,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);

	}



	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 */

	if (!radeon_connector->edid)

		radeon_connector->edid = radeon_combios_get_hardcoded_edid(rdev);

			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
Original line number Diff line number Diff line
@@ -566,7 +566,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 *