drm:i915:display: add checks for Gen9 devices with hdr capability
Subsystems (3)
PATCH 1/1 drm:i915:display: add checks for Gen9 devices with hdr capability
this patch adds hdr capabilities checks for Gen9 devices with lspcon support.
--- 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(-)
drivers/gpu/drm/i915/display/intel_hdmi.c +13 -4
@@ -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);
drivers/gpu/drm/i915/display/intel_lspcon.c +7 -2
@@ -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 );
Signature · 6 lines
2.26.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm:i915:display: add checks for Gen9 devices with hdr capability
== Series Details ==
== Series Details ==
Series: drm:i915:display: add checks for Gen9 devices with hdr capability
URL : https://patchwork.freedesktop.org/series/75114/
State : failure
== Summary ==
Applying: drm:i915:display: add checks for Gen9 devices with hdr capability
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/display/intel_hdmi.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm:i915:display: add checks for Gen9 devices with hdr capability When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 2 lines · Vipin Anand
this patch adds hdr capabilities checks for Gen9 devices with lspcon support.
For a lot of the changes I don't see how you'd end up in the code paths with LSPCON, because from the driver perspective LSPCON is DP. (We always use PCON mode.)
There's also some conflation with the LSPCON vendor related changes that should probably be separate, if they are valid.
This does not apply on top of current drm-tip; what is it based on?
Did you actually try this?
BR,
Jani.
Quoted 101 lines
Signed-off-by Vipin Anand <[email protected]>--- 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(-)drivers/gpu/drm/i915/display/intel_hdmi.c +13
-4@@ -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);drivers/gpu/drm/i915/display/intel_lspcon.c +7
-2@@ -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 );
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx