Commit 2e666613 authored by Uma Shankar's avatar Uma Shankar
Browse files

drm/i915/display: Attach HDR property for capable Gen9 devices 



Attach HDR property for Gen9 devices with MCA LSPCON
chips.

v2: Cleaned HDR property attachment logic based on capability
as per Jani Nikula's suggestion.

v3: Fixed the HDR property attachment logic as per the new changes
by Kai-Feng to align with lspcon detection failure on some devices.

v4: Add HDR proprty in late_register to handle lspcon detection,
as suggested by Ville.

v5: Init Lspcon only if advertized from BIOS.

v6: Added a Todo to plan a cleanup later, added Ville's RB.

Signed-off-by: default avatarUma Shankar <uma.shankar@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201130204738.2443-4-uma.shankar@intel.com
parent 1a911350

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

+18 −0
Original line number Diff line number Diff line
@@ -6774,6 +6774,8 @@ intel_dp_connector_register(struct drm_connector *connector) 
{

	struct drm_i915_private *i915 = to_i915(connector->dev);

	struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	struct intel_lspcon *lspcon = &dig_port->lspcon;

	int ret;



	ret = intel_connector_register(connector);
@@ -6787,6 +6789,22 @@ intel_dp_connector_register(struct drm_connector *connector) 
	ret = drm_dp_aux_register(&intel_dp->aux);

	if (!ret)

		drm_dp_cec_register_connector(&intel_dp->aux, connector);



	if (!intel_bios_is_lspcon_present(i915, dig_port->base.port))

		return ret;



	/*

	 * ToDo: Clean this up to handle lspcon init and resume more

	 * efficiently and streamlined.

	 */

	if (lspcon_init(dig_port)) {

		lspcon_detect_hdr_capability(lspcon);

		if (lspcon->hdr_supported)

			drm_object_attach_property(&connector->base,

						   connector->dev->mode_config.hdr_output_metadata_property,

						   0);

	}



	return ret;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ void lspcon_wait_pcon_mode(struct intel_lspcon *lspcon) 
	lspcon_wait_mode(lspcon, DRM_LSPCON_MODE_PCON);

}



static bool lspcon_init(struct intel_digital_port *dig_port)

bool lspcon_init(struct intel_digital_port *dig_port)

{

	struct intel_dp *dp = &dig_port->dp;

	struct intel_lspcon *lspcon = &dig_port->lspcon;

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct intel_digital_port; 
struct intel_encoder;

struct intel_lspcon;



bool lspcon_init(struct intel_digital_port *dig_port);

void lspcon_detect_hdr_capability(struct intel_lspcon *lspcon);

void lspcon_resume(struct intel_digital_port *dig_port);

void lspcon_wait_pcon_mode(struct intel_lspcon *lspcon);