Commit c5044aee authored by Uma Shankar's avatar Uma Shankar
Browse files

drm/i915/display: Enable HDR for Parade based lspcon 



Enable HDR for LSPCON based on Parade along with MCA.

v2: Added a helper for status reg as suggested by Ville.

v3: Removed a redundant variable, added Ville's RB.

Signed-off-by: default avatarUma Shankar <uma.shankar@intel.com>
Signed-off-by: default avatarVipin Anand <vipin.anand@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201130204738.2443-11-uma.shankar@intel.com
parent 84ab44b7

drivers/gpu/drm/i915/display/intel_lspcon.c

+11 −6
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#define LSPCON_VENDOR_MCA_OUI 0x0060AD



#define DPCD_MCA_LSPCON_HDR_STATUS	0x70003

#define DPCD_PARADE_LSPCON_HDR_STATUS	0x00511



/* AUX addresses to write MCA AVI IF */

#define LSPCON_MCA_AVI_IF_WRITE_OFFSET 0x5C0
@@ -106,6 +107,14 @@ static bool lspcon_detect_vendor(struct intel_lspcon *lspcon) 
	return true;

}



static u32 get_hdr_status_reg(struct intel_lspcon *lspcon)

{

	if (lspcon->vendor == LSPCON_VENDOR_MCA)

		return DPCD_MCA_LSPCON_HDR_STATUS;

	else

		return DPCD_PARADE_LSPCON_HDR_STATUS;

}



void lspcon_detect_hdr_capability(struct intel_lspcon *lspcon)

{

	struct intel_digital_port *dig_port =
@@ -115,12 +124,8 @@ void lspcon_detect_hdr_capability(struct intel_lspcon *lspcon) 
	u8 hdr_caps;

	int ret;



	/* Enable HDR for MCA based LSPCON devices */

	if (lspcon->vendor == LSPCON_VENDOR_MCA)

		ret = drm_dp_dpcd_read(&dp->aux, DPCD_MCA_LSPCON_HDR_STATUS,

	ret = drm_dp_dpcd_read(&dp->aux, get_hdr_status_reg(lspcon),

			       &hdr_caps, 1);

	else

		return;



	if (ret < 0) {

		drm_dbg_kms(dev, "HDR capability detection failed\n");