All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Vipin Anand <vipin.anand@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 7/7] drm:i915:display: add checks for Gen9 devices with hdr capability
Date: Tue, 07 Apr 2020 15:41:20 +0300	[thread overview]
Message-ID: <875zebjwnj.fsf@intel.com> (raw)
In-Reply-To: <20200327052357.22269-8-vipin.anand@intel.com>

On Fri, 27 Mar 2020, Vipin Anand <vipin.anand@intel.com> wrote:
> this patch adds hdr capabilities checks for Gen9 devices with
> lspcon support.

My earlier feedback to this patch holds. I don't really understand what
you're trying to achieve.

BR,
Jani.

>
> Signed-off-by: Vipin Anand <vipin.anand@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_hdmi.c   | 17 +++++++++++++----
>  drivers/gpu/drm/i915/display/intel_lspcon.c |  9 +++++++--
>  2 files changed, 20 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 9ae2f88cc925..70d0d76ed606 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -833,9 +833,12 @@ intel_hdmi_compute_drm_infoframe(struct intel_encoder *encoder,
>  {
>  	struct hdmi_drm_infoframe *frame = &crtc_state->infoframes.drm.drm;
>  	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> +	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
>  	int ret;
>  
> -	if (!(INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)))
> +	if (!(INTEL_GEN(dev_priv) >= 10 ||
> +	      (((INTEL_GEN(dev_priv) >= 9)) &&
> +	      intel_dig_port->lspcon.active)))
>  		return true;
>  
>  	if (!crtc_state->has_infoframe)
> @@ -2102,9 +2105,12 @@ static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder)
>  	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>  	const struct ddi_vbt_port_info *info =
>  		&dev_priv->vbt.ddi_port_info[encoder->port];
> +	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
>  	int max_tmds_clock;
>  
> -	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> +	if (INTEL_GEN(dev_priv) >= 10 ||
> +	    (((INTEL_GEN(dev_priv) >= 9)) &&
> +			 intel_dig_port->lspcon.active))
>  		max_tmds_clock = 594000;
>  	else if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv))
>  		max_tmds_clock = 300000;
> @@ -2423,6 +2429,7 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,
>  	struct intel_digital_connector_state *intel_conn_state =
>  		to_intel_digital_connector_state(conn_state);
>  	bool force_dvi = intel_conn_state->force_audio == HDMI_AUDIO_OFF_DVI;
> +	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
>  	int ret;
>  
>  	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
> @@ -2469,7 +2476,8 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,
>  	pipe_config->lane_count = 4;
>  
>  	if (scdc->scrambling.supported && (INTEL_GEN(dev_priv) >= 10 ||
> -					   IS_GEMINILAKE(dev_priv))) {
> +					   (((INTEL_GEN(dev_priv) >= 9)) &&
> +					    intel_dig_port->lspcon.active))) {
>  		if (scdc->scrambling.low_rates)
>  			pipe_config->hdmi_scrambling = true;
>  
> @@ -3171,7 +3179,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
>  	connector->doublescan_allowed = 0;
>  	connector->stereo_allowed = 1;
>  
> -	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> +	if (INTEL_GEN(dev_priv) >= 10 ||
> +	    (((INTEL_GEN(dev_priv) >= 9)) && intel_dig_port->lspcon.active))
>  		connector->ycbcr_420_allowed = true;
>  
>  	intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port);
> diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c
> index 5cede4f07f22..be074acd74f3 100644
> --- a/drivers/gpu/drm/i915/display/intel_lspcon.c
> +++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
> @@ -116,6 +116,8 @@ static bool lspcon_detect_hdr_capability(struct intel_lspcon *lspcon)
>  	if (lspcon->vendor == LSPCON_VENDOR_MCA)
>  		ret = drm_dp_dpcd_read(&dp->aux, DPCD_MCA_LSPCON_HDR_STATUS,
>  				       &hdr_caps, 1);
> +	else if (lspcon->vendor == LSPCON_VENDOR_PARADE)
> +		return true;
>  	else
>  		return false;
>  
> @@ -474,7 +476,8 @@ void lspcon_write_infoframe(struct intel_encoder *encoder,
>  	 * Todo: Add support for Parade later
>  	 */
>  	if (type == HDMI_PACKET_TYPE_GAMUT_METADATA &&
> -	    lspcon->vendor != LSPCON_VENDOR_MCA)
> +		(lspcon->vendor != LSPCON_VENDOR_MCA ||
> +		 lspcon->vendor != LSPCON_VENDOR_PARADE))
>  		return;
>  
>  	if (lspcon->vendor == LSPCON_VENDOR_MCA) {
> @@ -646,7 +649,9 @@ bool lspcon_init(struct intel_digital_port *intel_dig_port)
>  		return false;
>  	}
>  
> -	if (lspcon->vendor == LSPCON_VENDOR_MCA && lspcon->hdr_supported)
> +	if ((lspcon->vendor == LSPCON_VENDOR_MCA ||
> +	     lspcon->vendor == LSPCON_VENDOR_PARADE) &&
> +	     lspcon->hdr_supported)
>  		drm_object_attach_property(&connector->base,
>  					   connector->dev->mode_config.hdr_output_metadata_property,
>  					   0);

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2020-04-07 12:41 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-27  5:23 [Intel-gfx] [PATCH 0/7] Enable HDR on Gen9 devices with lspcon hdr capability Vipin Anand
2020-03-27  5:23 ` [Intel-gfx] [PATCH 1/7] drm/i915/display: Add HDR Capability detection for LSPCON Vipin Anand
2020-04-07 12:44   ` Jani Nikula
2020-03-27  5:23 ` [Intel-gfx] [PATCH 2/7] drm/i915/display: Enable HDR on gen9 devices with MCA Lspcon Vipin Anand
2020-04-07 12:34   ` Jani Nikula
2020-03-27  5:23 ` [Intel-gfx] [PATCH 3/7] drm/i915/display: Attach HDR property for capable Gen9 devices Vipin Anand
2020-04-07 12:35   ` Jani Nikula
2020-03-27  5:23 ` [Intel-gfx] [PATCH 4/7] drm/i915/display: Set HDR Infoframe for HDR capable LSPCON devices Vipin Anand
2020-04-07 12:37   ` Jani Nikula
2020-04-07 12:37     ` Jani Nikula
2020-03-27  5:23 ` [Intel-gfx] [PATCH 5/7] drm/i915/display: Enable BT2020 for HDR on " Vipin Anand
2020-03-27  5:23 ` [Intel-gfx] [PATCH 6/7] drm/i915/display: Reduce blanking to support 4k60@10bpp for LSPCON Vipin Anand
2020-04-07 12:40   ` Jani Nikula
2020-03-27  5:23 ` [Intel-gfx] [PATCH 7/7] drm:i915:display: add checks for Gen9 devices with hdr capability Vipin Anand
2020-04-07 12:41   ` Jani Nikula [this message]
2020-03-27  5:44 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Enable HDR on Gen9 devices with lspcon " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=875zebjwnj.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=vipin.anand@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.