Enable HDR on MCA LSPCON based Gen9 devices
Subsystems (3)
v7 cover Enable HDR on MCA LSPCON based Gen9 devices
Gen9 hardware supports HDMI2.0 through LSPCON chips. Extending HDR support for MCA and Parade LSPCON based GEN9 devices.
SOC will drive LSPCON as DP and send HDR metadata as standard DP SDP packets. LSPCON will be set to operate in PCON mode, will receive the metadata and create Dynamic Range and Mastering Infoframe (DRM packets) and send it to HDR capable HDMI sink devices.
v2: Fixed Ville's review comments. Suppressed some warnings. Patch 8 of the series is marked "Not for Merge" and is just for reference to userspace people to incorporate in order to support 10bit content with 4K@60 resolutions.
v3: Added Infoframe readout support for DRM infoframes. Addressed Jani Nikula's review comments.
v4: Addressed Ville's review comments and added proper bitmask for enabled infoframes. Series also incorporates Ville's patch for stopping infoframes to be sent to DVI sinks. Extended the same for DRM as well.
v5: Created separate helper function for lspcon_infoframes_enabled as per Ville's suggestion.
v6: Rebase
v7: Addressed Ville's review comments.
Note: Patch 10 of the series is for reference to userspace, not to be merged to driver.
Uma Shankar (10):
drm/i915/display: Add HDR Capability detection for LSPCON drm/i915/display: Enable HDR on gen9 devices with MCA Lspcon drm/i915/display: Attach HDR property for capable Gen9 devices drm/i915/display: Enable BT2020 for HDR on LSPCON devices drm/i915/display: Enable HDR for Parade based lspcon drm/i915/display: Implement infoframes readback for LSPCON drm/i915/display: Implement DRM infoframe read for LSPCON drm/i915/lspcon: Create separate infoframe_enabled helper drm/i915/lspcon: Do not send DRM infoframes to non-HDMI sinks drm/i915/display: [NOT FOR MERGE] Reduce blanking to support
4k60@10bpp for LSPCON
drivers/gpu/drm/i915/display/intel_ddi.c | 40 +++- .../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 17 ++ drivers/gpu/drm/i915/display/intel_hdmi.c | 15 +- drivers/gpu/drm/i915/display/intel_lspcon.c | 182 +++++++++++++++--- drivers/gpu/drm/i915/display/intel_lspcon.h | 11 ++ drivers/gpu/drm/i915/i915_reg.h | 2 + 7 files changed, 232 insertions(+), 36 deletions(-)
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 1/10 drm/i915/display: Add HDR Capability detection for LSPCON
LSPCON firmware exposes HDR capability through LPCON_CAPABILITIES DPCD register. LSPCON implementations capable of supporting HDR set HDR_CAPABILITY bit in LSPCON_CAPABILITIES to 1. This patch reads the same, detects the HDR capability and adds this to intel_lspcon struct.
v2: Addressed Jani Nikula's review comment and fixed the HDR
capability detection logic
--- .../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_lspcon.c | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+)
drivers/gpu/drm/i915/display/intel_display_types.h +1 -0
@@ -1398,6 +1398,7 @@ struct intel_lspcon {bool active;enum drm_lspcon_mode mode;enum lspcon_vendor vendor; +bool hdr_supported; };struct intel_digital_port {
drivers/gpu/drm/i915/display/intel_lspcon.c +30 -0
@@ -35,6 +35,8 @@#define LSPCON_VENDOR_PARADE_OUI 0x001CF8#define LSPCON_VENDOR_MCA_OUI 0x0060AD +#define DPCD_MCA_LSPCON_HDR_STATUS 0x70003 +/* AUX addresses to write MCA AVI IF */ #define LSPCON_MCA_AVI_IF_WRITE_OFFSET 0x5C0#define LSPCON_MCA_AVI_IF_CTRL 0x5DF
@@ -104,6 +106,32 @@ static bool lspcon_detect_vendor(struct intel_lspcon *lspcon)return true; } +static void lspcon_detect_hdr_capability (struct intel_lspcon *lspcon) +{ +struct intel_digital_port *intel_dig_port = + container_of(lspcon, struct intel_digital_port, lspcon); +struct drm_device *dev = intel_dig_port->base.base.dev; +struct intel_dp *dp =lspcon_to_intel_dp (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 , + &hdr_caps,1 ); +else +return ; + +if (ret <0 ) { +drm_dbg_kms (dev,"hdr capability detection failed\n" ); + lspcon->hdr_supported = false; +return ; + }else if (hdr_caps &0x1 ) { +drm_dbg_kms (dev,"lspcon capable of HDR\n" ); + lspcon->hdr_supported = true; + } +} +static enum drm_lspcon_mode lspcon_get_current_mode (struct intel_lspcon *lspcon) {enum drm_lspcon_mode current_mode;
@@ -554,6 +582,8 @@ static bool lspcon_init(struct intel_digital_port *dig_port)return false; } +lspcon_detect_hdr_capability (lspcon); + connector->ycbcr_420_allowed = true; lspcon->active = true;DRM_DEBUG_KMS ("Success: LSPCON init\n" );
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 2/10 drm/i915/display: Enable HDR on gen9 devices with MCA Lspcon
In reply to Uma ShankarGen9 hardware supports HDMI2.0 through LSPCON chips. Extending HDR support for MCA LSPCON based GEN9 devices.
SOC will drive LSPCON as DP and send HDR metadata as standard DP SDP packets. LSPCON will be set to operate in PCON mode, will receive the metadata and create Dynamic Range and Mastering Infoframe (DRM packets) and send it to HDR capable HDMI sink devices.
v2: Re-used hsw infoframe write implementation for HDR metadata for LSPCON as per Ville's suggestion.
v3: Addressed Jani Nikula's review comments.
v4: Addressed Ville's review comments, removed redundant wrapper and checks, passed arguments instead of hardcodings.
--- drivers/gpu/drm/i915/display/intel_hdmi.c | 8 +++--- drivers/gpu/drm/i915/display/intel_lspcon.c | 31 ++++++++++++--------- drivers/gpu/drm/i915/display/intel_lspcon.h | 4 +++ 3 files changed, 26 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/display/intel_hdmi.c +4 -4
@@ -518,10 +518,10 @@ static u32 vlv_infoframes_enabled(struct intel_encoder *encoder, VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP); } -static void hsw_write_infoframe (struct intel_encoder *encoder, -const struct intel_crtc_state *crtc_state, -unsigned int type, -const void *frame,ssize_t len) +void hsw_write_infoframe (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state, +unsigned int type, +const void *frame,ssize_t len) {const u32 *data = frame;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);
drivers/gpu/drm/i915/display/intel_lspcon.c +18 -13
@@ -461,27 +461,32 @@ void lspcon_write_infoframe(struct intel_encoder *encoder,unsigned int type, const void *frame, ssize_t len) { - bool ret; + bool ret = true;struct intel_dp *intel_dp =enc_to_intel_dp (encoder);struct intel_lspcon *lspcon =enc_to_intel_lspcon (encoder); -/* LSPCON only needs AVI IF */ -if (type !=HDMI_INFOFRAME_TYPE_AVI ) +switch (type) { +case HDMI_INFOFRAME_TYPE_AVI : +if (lspcon->vendor ==LSPCON_VENDOR_MCA ) + ret =_lspcon_write_avi_infoframe_mca (&intel_dp->aux, + frame, len); +else + ret =_lspcon_write_avi_infoframe_parade (&intel_dp->aux, + frame, len); +break ; +case HDMI_PACKET_TYPE_GAMUT_METADATA : +drm_dbg_kms (encoder->base.dev,"Update HDR metadata for lspcon\n" ); +/* It uses the legacy hsw implementation for the same */ +hsw_write_infoframe (encoder, crtc_state, type, frame, len); +break ; +default :return ; - -if (lspcon->vendor ==LSPCON_VENDOR_MCA ) - ret =_lspcon_write_avi_infoframe_mca (&intel_dp->aux, - frame, len); -else - ret =_lspcon_write_avi_infoframe_parade (&intel_dp->aux, - frame, len); + }if (!ret) { -DRM_ERROR ("Failed to write AVI infoframes\n" ); +DRM_ERROR ("Failed to write infoframes\n" );return ; } - -DRM_DEBUG_DRIVER ("AVI infoframes updated successfully\n" ); } void lspcon_read_infoframe(struct intel_encoder *encoder,
drivers/gpu/drm/i915/display/intel_lspcon.h +4 -0
@@ -33,5 +33,9 @@ u32 lspcon_infoframes_enabled(struct intel_encoder *encoder, const struct intel_crtc_state *pipe_config);void lspcon_ycbcr420_config (struct drm_connector *connector,struct intel_crtc_state *crtc_state); +void hsw_write_infoframe (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state, +unsigned int type, +const void *frame,ssize_t len);#endif /* __INTEL_LSPCON_H__ */
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 3/10 drm/i915/display: Attach HDR property for capable Gen9 devices
In reply to Uma ShankarAttach 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.
--- drivers/gpu/drm/i915/display/intel_ddi.c | 20 +++++++++++++++++++- drivers/gpu/drm/i915/display/intel_lspcon.c | 6 +++++- drivers/gpu/drm/i915/display/intel_lspcon.h | 1 + 3 files changed, 25 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +19 -1
@@ -5111,7 +5111,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) {struct intel_digital_port *dig_port;struct intel_encoder *encoder; -bool init_hdmi, init_dp; +bool init_hdmi, init_dp, init_lspcon = false;enum phy phy =intel_port_to_phy (dev_priv, port);/*
@@ -5137,6 +5137,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)* is initialized before lspcon. */ init_dp = true; + init_lspcon = true; init_hdmi = false;drm_dbg_kms (&dev_priv->drm,"VBT says port %c has lspcon\n" ,port_name (port));
@@ -5256,6 +5257,23 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)intel_infoframe_init (dig_port); +if (init_lspcon) { +if (lspcon_init (dig_port)) +/* TODO: handle hdmi info frame part */ +drm_dbg_kms (&dev_priv->drm, +"LSPCON init success on port %c\n" , +port_name (port)); +else +/* +* LSPCON init failed at driver load, this will be re-attempted +* after hotplug. +* Note: There is an issue on some LSPCON configurations which +* triggered the need for this WA. +*/ +drm_dbg_kms (&dev_priv->drm,"LSPCON init failed at driver load on port %c\n" , +port_name (port)); + } +return ; err:
drivers/gpu/drm/i915/display/intel_lspcon.c +5 -1
@@ -563,7 +563,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;
@@ -588,6 +588,10 @@ static bool lspcon_init(struct intel_digital_port *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 ); connector->ycbcr_420_allowed = true; lspcon->active = true;
drivers/gpu/drm/i915/display/intel_lspcon.h +1 -0
@@ -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_resume (struct intel_digital_port *dig_port);void lspcon_wait_pcon_mode (struct intel_lspcon *lspcon); void lspcon_write_infoframe(struct intel_encoder *encoder,
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 4/10 drm/i915/display: Enable BT2020 for HDR on LSPCON devices
In reply to Uma ShankarEnable Colorspace as BT2020 if driving HDR content.Sending Colorimetry data for HDR using AVI infoframe. LSPCON firmware expects this and though SOC drives DP, for HDMI panel AVI infoframe is sent to the LSPCON device which transfers the same to HDMI sink.
v2: Dropped state managed in drm core as per Jani Nikula's suggestion.
v3: Aligned colorimetry handling for lspcon as per compute_avi_infoframes, as suggested by Ville.
--- drivers/gpu/drm/i915/display/intel_lspcon.c | 25 ++++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_lspcon.c +19 -6
@@ -534,12 +534,25 @@ void lspcon_set_infoframes(struct intel_encoder *encoder, frame.avi.colorspace =HDMI_COLORSPACE_RGB ; } -drm_hdmi_avi_infoframe_quant_range (&frame.avi, - conn_state->connector, - adjusted_mode, - crtc_state->limited_color_range ? -HDMI_QUANTIZATION_RANGE_LIMITED : -HDMI_QUANTIZATION_RANGE_FULL ); +drm_hdmi_avi_infoframe_colorspace (&frame.avi, conn_state); + +/* nonsense combination */ +drm_WARN_ON (encoder->base.dev, crtc_state->limited_color_range && + crtc_state->output_format !=INTEL_OUTPUT_FORMAT_RGB ); + +if (crtc_state->output_format ==INTEL_OUTPUT_FORMAT_RGB ) { +drm_hdmi_avi_infoframe_quant_range (&frame.avi, + conn_state->connector, + adjusted_mode, + crtc_state->limited_color_range ? +HDMI_QUANTIZATION_RANGE_LIMITED : +HDMI_QUANTIZATION_RANGE_FULL ); + }else { + frame.avi.quantization_range =HDMI_QUANTIZATION_RANGE_DEFAULT ; + frame.avi.ycc_quantization_range =HDMI_YCC_QUANTIZATION_RANGE_LIMITED ; + } + +drm_hdmi_avi_infoframe_content_type (&frame.avi, conn_state); ret =hdmi_infoframe_pack (&frame, buf,sizeof (buf));if (ret <0 ) {
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 5/10 drm/i915/display: Enable HDR for Parade based lspcon
In reply to Uma ShankarEnable HDR for LSPCON based on Parade along with MCA.
v2: Added a helper for status reg as suggested by Ville.
--- drivers/gpu/drm/i915/display/intel_lspcon.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_lspcon.c +14 -6
@@ -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,21 +107,28 @@ 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 ; +} +static void lspcon_detect_hdr_capability (struct intel_lspcon *lspcon) {struct intel_digital_port *intel_dig_port = container_of(lspcon, struct intel_digital_port, lspcon);struct drm_device *dev = intel_dig_port->base.base.dev;struct intel_dp *dp =lspcon_to_intel_dp (lspcon); +u32 lspcon_hdr_status_reg;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 , - &hdr_caps,1 ); -else -return ; + lspcon_hdr_status_reg =get_hdr_status_reg (lspcon); + + ret =drm_dp_dpcd_read (&dp->aux, lspcon_hdr_status_reg, + &hdr_caps,1 );if (ret <0 ) {drm_dbg_kms (dev,"hdr capability detection failed\n" );
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 6/10 drm/i915/display: Implement infoframes readback for LSPCON
In reply to Uma ShankarImplemented Infoframes enabled readback for LSPCON devices. This will help align the implementation with state readback infrastructure.
v2: Added proper bitmask of enabled infoframes as per Ville's recommendation.
v3: Added pcon specific infoframe types instead of using the HSW one's, as recommended by Ville.
--- drivers/gpu/drm/i915/display/intel_lspcon.c | 57 ++++++++++++++++++++- drivers/gpu/drm/i915/i915_reg.h | 2 + 2 files changed, 57 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_lspcon.c +55 -2
@@ -572,11 +572,64 @@ void lspcon_set_infoframes(struct intel_encoder *encoder, buf, ret); } +static bool _lspcon_read_avi_infoframe_enabled_mca (struct drm_dp_aux *aux) +{ +int ret; +u32 val =0 ; +u16 reg =LSPCON_MCA_AVI_IF_CTRL ; + + ret =drm_dp_dpcd_read (aux, reg, &val,1 ); +if (ret <0 ) { +DRM_ERROR ("DPCD read failed, address 0x%x\n" , reg); +return false; + } + +return val &LSPCON_MCA_AVI_IF_KICKOFF ; +} + +static bool _lspcon_read_avi_infoframe_enabled_parade (struct drm_dp_aux *aux) +{ +int ret; +u32 val =0 ; +u16 reg =LSPCON_PARADE_AVI_IF_CTRL ; + + ret =drm_dp_dpcd_read (aux, reg, &val,1 ); +if (ret <0 ) { +DRM_ERROR ("DPCD read failed, address 0x%x\n" , reg); +return false; + } + +return val &LSPCON_PARADE_AVI_IF_KICKOFF ; +} +u32 lspcon_infoframes_enabled (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -/* FIXME actually read this from the hw */ -return 0 ; +struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +struct intel_lspcon *lspcon =enc_to_intel_lspcon (encoder); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +bool infoframes_enabled; +u32 val =0 ; +u32 mask, tmp; + +if (lspcon->vendor ==LSPCON_VENDOR_MCA ) + infoframes_enabled =_lspcon_read_avi_infoframe_enabled_mca (&intel_dp->aux); +else + infoframes_enabled =_lspcon_read_avi_infoframe_enabled_parade (&intel_dp->aux); + +if (infoframes_enabled) + val |=VIDEO_DIP_ENABLE_AVI_PCON ; + +if (lspcon->hdr_supported) { + tmp =intel_de_read (dev_priv, +HSW_TVIDEO_DIP_CTL (pipe_config->cpu_transcoder)); + mask =VIDEO_DIP_ENABLE_GMP_PCON ; + +if (tmp & mask) + val |= mask; + } + +return val; }void lspcon_wait_pcon_mode (struct intel_lspcon *lspcon)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -4977,6 +4977,8 @@ enum {#define VIDEO_DIP_ENABLE_VS_HSW (1 << 8)#define VIDEO_DIP_ENABLE_GMP_HSW (1 << 4)#define VIDEO_DIP_ENABLE_SPD_HSW (1 << 0) +#define VIDEO_DIP_ENABLE_AVI_PCON (1 << 12) +#define VIDEO_DIP_ENABLE_GMP_PCON (1 << 4)/* Panel power sequencing */ #define PPS_BASE 0x61200
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 7/10 drm/i915/display: Implement DRM infoframe read for LSPCON
In reply to Uma ShankarImplement Read back of HDR metadata infoframes i.e Dynamic Range and Mastering Infoframe for LSPCON devices.
v2: Added proper bitmask of enabled infoframes as per Ville's recommendation.
v3: Dropped a redundant wrapper as per Ville's comment.
--- drivers/gpu/drm/i915/display/intel_hdmi.c | 7 +++---- drivers/gpu/drm/i915/display/intel_lspcon.c | 7 ++++++- drivers/gpu/drm/i915/display/intel_lspcon.h | 4 ++++ 3 files changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_hdmi.c +3 -4
@@ -555,10 +555,9 @@ void hsw_write_infoframe(struct intel_encoder *encoder,intel_de_posting_read (dev_priv, ctl_reg); } -static void hsw_read_infoframe (struct intel_encoder *encoder, -const struct intel_crtc_state *crtc_state, -unsigned int type, -void *frame,ssize_t len) +void hsw_read_infoframe (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state, +unsigned int type,void *frame,ssize_t len) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
drivers/gpu/drm/i915/display/intel_lspcon.c +6 -1
@@ -502,7 +502,12 @@ void lspcon_read_infoframe(struct intel_encoder *encoder,unsigned int type, void *frame, ssize_t len) { - /* FIXME implement this */ + /* FIXME implement for AVI Infoframe as well */ + if (type == HDMI_PACKET_TYPE_GAMUT_METADATA) { + drm_dbg_kms(encoder->base.dev, "Read HDR metadata for lspcon\n"); +hsw_read_infoframe (encoder, crtc_state, type, + frame, len); + } } void lspcon_set_infoframes(struct intel_encoder *encoder,
drivers/gpu/drm/i915/display/intel_lspcon.h +4 -0
@@ -38,5 +38,9 @@ void hsw_write_infoframe(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state, unsigned int type, const void *frame, ssize_t len); +void hsw_read_infoframe (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state, +unsigned int type, +void *frame,ssize_t len);#endif /* __INTEL_LSPCON_H__ */
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 8/10 drm/i915/lspcon: Create separate infoframe_enabled helper
In reply to Uma ShankarLspcon has Infoframes as well as DIP for HDR metadata(DRM Infoframe). Create a separate mechanism for lspcon compared to HDMI in order to address the same and ensure future scalability.
--- drivers/gpu/drm/i915/display/intel_ddi.c | 10 +++++++--- drivers/gpu/drm/i915/display/intel_lspcon.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_lspcon.h | 2 ++ 3 files changed, 27 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +7 -3
@@ -4408,6 +4408,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; +struct intel_digital_port *dig_port =enc_to_dig_port (encoder);u32 temp, flags =0 ;/* XXX: DSI transcoder paranoia */
@@ -4488,9 +4489,12 @@ void intel_ddi_get_config(struct intel_encoder *encoder, pipe_config->fec_enable); } - pipe_config->infoframes.enable |= -intel_hdmi_infoframes_enabled (encoder, pipe_config); - +if (dig_port->lspcon.active && dig_port->dp.has_hdmi_sink) + pipe_config->infoframes.enable |= +intel_lspcon_infoframes_enabled (encoder, pipe_config); +else + pipe_config->infoframes.enable |= +intel_hdmi_infoframes_enabled (encoder, pipe_config);break ;case TRANS_DDI_MODE_SELECT_DP_MST : pipe_config->output_types |=BIT (INTEL_OUTPUT_DP_MST );
drivers/gpu/drm/i915/display/intel_lspcon.c +18 -0
@@ -30,6 +30,7 @@#include "intel_display_types.h" #include "intel_dp.h" #include "intel_lspcon.h" +#include "intel_hdmi.h" /* LSPCON OUI Vendor ID(signatures) */ #define LSPCON_VENDOR_PARADE_OUI 0x001CF8
@@ -678,6 +679,23 @@ bool lspcon_init(struct intel_digital_port *dig_port)return true; } +u32 intel_lspcon_infoframes_enabled (struct intel_encoder *encoder, +const struct intel_crtc_state *pipe_config) +{ +struct intel_digital_port *dig_port =enc_to_dig_port (encoder); +u32 val, enabled =0 ; + + val = dig_port->infoframes_enabled (encoder, pipe_config); + +if (val &VIDEO_DIP_ENABLE_AVI_HSW ) + enabled |=intel_hdmi_infoframe_enable (HDMI_INFOFRAME_TYPE_AVI ); + +if (val &VIDEO_DIP_ENABLE_GMP_HSW ) + enabled |=intel_hdmi_infoframe_enable (HDMI_PACKET_TYPE_GAMUT_METADATA ); + +return enabled; +} +void lspcon_resume (struct intel_digital_port *dig_port) {struct intel_lspcon *lspcon = &dig_port->lspcon;
drivers/gpu/drm/i915/display/intel_lspcon.h +2 -0
@@ -42,5 +42,7 @@ void hsw_read_infoframe(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state, unsigned int type, void *frame, ssize_t len); +u32 intel_lspcon_infoframes_enabled (struct intel_encoder *encoder, +const struct intel_crtc_state *pipe_config);#endif /* __INTEL_LSPCON_H__ */
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 9/10 drm/i915/lspcon: Do not send DRM infoframes to non-HDMI sinks
In reply to Uma ShankarNon-HDMI sinks shouldn't be sent Dynamic Range and Mastering infoframes. Check for that when using LSPCON.
--- drivers/gpu/drm/i915/display/intel_ddi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_ddi.c +9 -1
@@ -3943,6 +3943,7 @@ static void intel_enable_ddi_dp(struct intel_atomic_state *state, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +struct intel_digital_port *dig_port =enc_to_dig_port (encoder);enum port port = encoder->port;if (port ==PORT_A &&INTEL_GEN (dev_priv) <9 )
@@ -3950,7 +3951,14 @@ static void intel_enable_ddi_dp(struct intel_atomic_state *state,intel_edp_backlight_on (crtc_state, conn_state);intel_psr_enable (intel_dp, crtc_state, conn_state); -intel_dp_set_infoframes (encoder, true, crtc_state, conn_state); + +if (dig_port->lspcon.active) { +if (dig_port->dp.has_hdmi_sink) +intel_dp_set_infoframes (encoder, true, crtc_state, conn_state); + }else { +intel_dp_set_infoframes (encoder, true, crtc_state, conn_state); + } +intel_edp_drrs_enable (intel_dp, crtc_state);if (crtc_state->has_audio)
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 10/10 drm/i915/display: [NOT FOR MERGE] Reduce blanking to support 4k60@10bpp for LSPCON
In reply to Uma ShankarBlanking needs to be reduced to incorporate DP and HDMI timing/link bandwidth limitations for CEA modes (4k@60 at 10 bpp). DP can drive 17.28Gbs while 4k modes (VIC97 etc) at 10 bpp required 17.8 Gbps. This will cause mode to blank out. Reduced Htotal by shortening the back porch and front porch within permissible limits.
Note: This is for reference for userspace, not to be merged in kernel.
v2: This is marked as Not for merge and the responsibilty to program these custom timings will be on userspace. This patch is just for reference purposes. This is based on Ville's recommendation.
v3: updated commit message.
--- drivers/gpu/drm/i915/display/intel_dp.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/gpu/drm/i915/display/intel_dp.c +17 -0
@@ -692,8 +692,10 @@ intel_dp_mode_valid(struct drm_connector *connector, {struct intel_dp *intel_dp =intel_attached_dp (to_intel_connector (connector));struct intel_connector *intel_connector =to_intel_connector (connector); +struct intel_encoder *intel_encoder =intel_attached_encoder (intel_connector);struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;struct drm_i915_private *dev_priv =to_i915 (connector->dev); +struct intel_lspcon *lspcon =enc_to_intel_lspcon (intel_encoder);int target_clock = mode->clock;int max_rate, mode_rate, max_lanes, max_link_clock;int max_dotclk = dev_priv->max_dotclk_freq;
@@ -714,6 +716,21 @@ intel_dp_mode_valid(struct drm_connector *connector, target_clock = fixed_mode->clock; } +/* +* Reducing Blanking to incorporate DP and HDMI timing/link bandwidth +* limitations for CEA modes (4k@60 at 10 bpp). DP can drive 17.28Gbs +* while 4k modes (VIC97 etc) at 10 bpp required 17.8 Gbps. This will +* cause mode to blank out. Reduced Htotal by shortening the back porch +* and front porch within permissible limits. +*/ +if (lspcon->active && lspcon->hdr_supported && + mode->clock >570000 ) { + mode->clock =570000 ; + mode->htotal -=180 ; + mode->hsync_start -=72 ; + mode->hsync_end -=72 ; + } + max_link_clock =intel_dp_max_link_rate (intel_dp); max_lanes =intel_dp_max_lane_count (intel_dp);
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Enable HDR on MCA LSPCON based Gen9 devices (rev7)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Enable HDR on MCA LSPCON based Gen9 devices (rev7)
URL : https://patchwork.freedesktop.org/series/68081/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. - +drivers/gpu/drm/i915/gt/intel_reset.c:1312:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block +drivers/gpu/drm/i915/gvt/mmio.c:290:23: warning: memcpy with byte count of 279040 +drivers/gpu/drm/i915/i915_perf.c:1440:15: warning: memset with byte count of 16777216 +drivers/gpu/drm/i915/i915_perf.c:1494:15: warning: memset with byte count of 16777216 +./include/linux/seqlock.h:752:24: warning: trying to copy expression type 31 +./include/linux/seqlock.h:778:16: warning: trying to copy expression type 31 +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write8' - different lock contexts for basic block
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Enable HDR on MCA LSPCON based Gen9 devices (rev7)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Enable HDR on MCA LSPCON based Gen9 devices (rev7)
URL : https://patchwork.freedesktop.org/series/68081/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9104 -> Patchwork_18636
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/index.html
Known issues
------------
Here are the changes found in Patchwork_18636 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-byt-j1900: [PASS][1] -> [DMESG-WARN][2] ([i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/fi-byt-j1900/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/fi-byt-j1900/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-icl-u2: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/fi-icl-u2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-byt-j1900: [DMESG-WARN][5] ([i915#1982]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/fi-byt-j1900/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/fi-byt-j1900/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: [DMESG-WARN][7] ([i915#1982]) -> [PASS][8] +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/fi-icl-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/fi-icl-u2/igt@[email protected]
* igt@vgem_basic@unload:
- fi-skl-guc: [DMESG-WARN][9] ([i915#2203]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/fi-skl-guc/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/fi-skl-guc/igt@[email protected]
#### Warnings ####
* igt@i915_selftest@live@execlists:
- fi-icl-u2: [DMESG-WARN][11] ([i915#289]) -> [INCOMPLETE][12] ([i915#2089] / [i915#2276])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/fi-icl-u2/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/fi-icl-u2/igt@i915_selftest@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- fi-kbl-x1275: [DMESG-WARN][13] ([i915#62] / [i915#92]) -> [DMESG-WARN][14] ([i915#62] / [i915#92] / [i915#95]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/fi-kbl-x1275/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/fi-kbl-x1275/igt@[email protected]
* igt@kms_force_connector_basic@prune-stale-modes:
- fi-kbl-x1275: [DMESG-WARN][15] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][16] ([i915#62] / [i915#92]) +4 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/fi-kbl-x1275/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/fi-kbl-x1275/igt@[email protected]
* igt@runner@aborted:
- fi-bdw-5557u: [FAIL][17] ([i915#2029] / [i915#2439]) -> [FAIL][18] ([i915#2029])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/fi-bdw-5557u/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/fi-bdw-5557u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2089]: https://gitlab.freedesktop.org/drm/intel/issues/2089
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2276]: https://gitlab.freedesktop.org/drm/intel/issues/2276
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2439]: https://gitlab.freedesktop.org/drm/intel/issues/2439
[i915#289]: https://gitlab.freedesktop.org/drm/intel/issues/289
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (45 -> 39)
------------------------------
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper
Build changes
-------------
* Linux: CI_DRM_9104 -> Patchwork_18636
CI-20190529: 20190529
CI_DRM_9104: 9cca7a33b0ebfaa5e0e86098b38eb7508097936a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5802: 0e4fbc60ca5ad6585e642d2ddf8313f3c738426e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18636: abd898c897e73756b71aefb95f6c0a066780c0a4 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
abd898c897e7 drm/i915/display: [NOT FOR MERGE] Reduce blanking to support 4k60@10bpp for LSPCON 8d45fc820402 drm/i915/lspcon: Do not send DRM infoframes to non-HDMI sinks 578f7ce4fbd1 drm/i915/lspcon: Create separate infoframe_enabled helper ae532edaa02c drm/i915/display: Implement DRM infoframe read for LSPCON 0cc417c5aba3 drm/i915/display: Implement infoframes readback for LSPCON ec936c8af664 drm/i915/display: Enable HDR for Parade based lspcon28e4e077c20d drm/i915/display: Enable BT2020 for HDR on LSPCON devices b24c255584b2 drm/i915/display: Attach HDR property for capable Gen9 devices f9e302350047 drm/i915/display: Enable HDR on gen9 devices with MCA Lspcon 09882a607420 drm/i915/display: Add HDR Capability detection for LSPCON
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for Enable HDR on MCA LSPCON based Gen9 devices (rev7)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Enable HDR on MCA LSPCON based Gen9 devices (rev7)
URL : https://patchwork.freedesktop.org/series/68081/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9104_full -> Patchwork_18636_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18636_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18636_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18636_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_create@madvise:
- shard-snb: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-snb4/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-snb2/igt@[email protected]
* igt@kms_vblank@pipe-a-query-forked-hang:
- shard-hsw: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-hsw5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-hsw2/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_18636_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#2389]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-glk5/igt@gem_exec_reloc@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-glk8/igt@gem_exec_reloc@[email protected]
* igt@gem_exec_whisper@basic-forked-all:
- shard-glk: [PASS][7] -> [DMESG-WARN][8] ([i915#118] / [i915#95])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-glk3/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-glk7/igt@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][9] -> [DMESG-WARN][10] ([i915#1436] / [i915#716])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl9/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl6/igt@[email protected]
* igt@kms_big_fb@x-tiled-64bpp-rotate-180:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([i915#1635] / [i915#1982])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-apl4/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-apl7/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
- shard-hsw: [PASS][13] -> [FAIL][14] ([i915#96])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-hsw4/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-hsw8/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [PASS][15] -> [FAIL][16] ([i915#2346])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl3/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [PASS][17] -> [FAIL][18] ([i915#79])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl9/igt@kms_flip@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl6/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a2:
- shard-glk: [PASS][19] -> [FAIL][20] ([i915#2122])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-glk4/igt@kms_flip@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-glk1/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [PASS][21] -> [INCOMPLETE][22] ([i915#155] / [i915#180]) +3 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-kbl2/igt@kms_flip@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-kbl6/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-blt:
- shard-glk: [PASS][23] -> [FAIL][24] ([i915#49])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-glk2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-glk5/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-mmap-wc:
- shard-tglb: [PASS][25] -> [DMESG-WARN][26] ([i915#1982]) +3 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-tglb8/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-tglb2/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-indfb-scaledprimary:
- shard-skl: [PASS][27] -> [FAIL][28] ([i915#49])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl3/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl3/igt@[email protected]
* igt@kms_plane@plane-position-covered-pipe-b-planes:
- shard-skl: [PASS][29] -> [DMESG-WARN][30] ([i915#1982]) +11 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl6/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][31] -> [FAIL][32] ([fdo#108145] / [i915#265]) +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl2/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl9/igt@[email protected]
* igt@kms_psr@psr2_dpms:
- shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109441]) +4 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-iclb2/igt@kms_psr@psr2_dpms.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-iclb1/igt@kms_psr@psr2_dpms.html
* igt@perf@polling:
- shard-skl: [PASS][35] -> [FAIL][36] ([i915#1542])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl10/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl10/igt@[email protected]
* igt@sysfs_preempt_timeout@timeout@vcs0:
- shard-skl: [PASS][37] -> [FAIL][38] ([i915#2060])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl6/igt@sysfs_preempt_timeout@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl2/igt@sysfs_preempt_timeout@[email protected]
#### Possible fixes ####
* igt@gem_ctx_persistence@file:
- shard-skl: [TIMEOUT][39] ([i915#2544]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl5/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl5/igt@[email protected]
* igt@gem_ctx_shared@q-independent@vecs0:
- shard-skl: [DMESG-WARN][41] ([i915#2544]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl5/igt@gem_ctx_shared@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl5/igt@gem_ctx_shared@[email protected]
* igt@gem_exec_create@madvise:
- shard-hsw: [FAIL][43] ([i915#1888]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-hsw8/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-hsw6/igt@[email protected]
- shard-glk: [FAIL][45] ([i915#2545]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-glk1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-glk4/igt@[email protected]
* igt@gem_exec_whisper@basic-queues-priority:
- shard-glk: [DMESG-WARN][47] ([i915#118] / [i915#95]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-glk6/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-glk2/igt@[email protected]
* igt@gem_userptr_blits@unsync-unmap-cycles:
- shard-skl: [TIMEOUT][49] ([i915#2424]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl1/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl1/igt@[email protected]
* {igt@kms_async_flips@alternate-sync-async-flip}:
- shard-apl: [FAIL][51] ([i915#1635] / [i915#2521]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-apl6/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-apl4/igt@[email protected]
* {igt@kms_async_flips@async-flip-with-page-flip-events}:
- shard-kbl: [FAIL][53] ([i915#2521]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-kbl1/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-kbl6/igt@[email protected]
* igt@kms_big_fb@linear-8bpp-rotate-180:
- shard-apl: [DMESG-WARN][55] ([i915#1635] / [i915#1982]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-apl6/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-apl4/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-skl: [INCOMPLETE][57] ([i915#300]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl7/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl7/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic:
- shard-skl: [FAIL][59] ([i915#2346]) -> [PASS][60] +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl6/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl2/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-skl: [FAIL][61] ([i915#79]) -> [PASS][62] +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl3/igt@kms_flip@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl3/igt@kms_flip@[email protected]
* igt@kms_flip@plain-flip-fb-recreate-interruptible@c-dp1:
- shard-kbl: [FAIL][63] ([i915#2122]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-kbl6/igt@kms_flip@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-kbl7/igt@kms_flip@[email protected]
* igt@kms_flip@plain-flip-ts-check@b-edp1:
- shard-skl: [FAIL][65] ([i915#2122]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl1/igt@kms_flip@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl1/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render:
- shard-tglb: [DMESG-WARN][67] ([i915#1982]) -> [PASS][68] +2 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-skl: [INCOMPLETE][69] ([i915#198]) -> [PASS][70] +1 similar issue
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl3/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl4/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: [DMESG-WARN][71] ([i915#180]) -> [PASS][72] +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-kbl6/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-kbl7/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [FAIL][73] ([fdo#108145] / [i915#265]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl6/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl2/igt@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][75] ([fdo#109441]) -> [PASS][76] +5 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-iclb8/igt@kms_psr@psr2_sprite_plane_move.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_setmode@basic:
- shard-skl: [FAIL][77] ([i915#31]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl6/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl2/igt@[email protected]
* igt@sysfs_heartbeat_interval@mixed@rcs0:
- shard-skl: [FAIL][79] ([i915#1731]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl7/igt@sysfs_heartbeat_interval@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl7/igt@sysfs_heartbeat_interval@[email protected]
#### Warnings ####
* igt@i915_pm_dc@dc6-psr:
- shard-skl: [FAIL][81] ([i915#454]) -> [INCOMPLETE][82] ([i915#198])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-skl8/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-skl5/igt@[email protected]
* igt@i915_pm_rpm@modeset-lpsp-stress-no-wait:
- shard-tglb: [INCOMPLETE][83] ([i915#2411]) -> [DMESG-WARN][84] ([i915#2411])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-tglb6/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-tglb5/igt@[email protected]
* igt@i915_suspend@forcewake:
- shard-tglb: [DMESG-WARN][85] ([i915#1436] / [i915#1602] / [i915#1887] / [i915#2411]) -> [INCOMPLETE][86] ([i915#1436] / [i915#1602] / [i915#1887] / [i915#2411] / [i915#456])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-tglb2/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-tglb6/igt@[email protected]
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-kbl: [DMESG-WARN][87] ([i915#180]) -> [INCOMPLETE][88] ([i915#155] / [i915#180] / [i915#794])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-kbl6/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-kbl4/igt@[email protected]
* igt@kms_vblank@pipe-d-ts-continuation-suspend:
- shard-tglb: [DMESG-WARN][89] ([i915#2411]) -> [INCOMPLETE][90] ([i915#1436] / [i915#1982])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9104/shard-tglb7/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/shard-tglb6/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1731]: https://gitlab.freedesktop.org/drm/intel/issues/1731
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1887]: https://gitlab.freedesktop.org/drm/intel/issues/1887
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2060]: https://gitlab.freedesktop.org/drm/intel/issues/2060
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2424]: https://gitlab.freedesktop.org/drm/intel/issues/2424
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2544]: https://gitlab.freedesktop.org/drm/intel/issues/2544
[i915#2545]: https://gitlab.freedesktop.org/drm/intel/issues/2545
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#456]: https://gitlab.freedesktop.org/drm/intel/issues/456
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#794]: https://gitlab.freedesktop.org/drm/intel/issues/794
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9104 -> Patchwork_18636
CI-20190529: 20190529
CI_DRM_9104: 9cca7a33b0ebfaa5e0e86098b38eb7508097936a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5802: 0e4fbc60ca5ad6585e642d2ddf8313f3c738426e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18636: abd898c897e73756b71aefb95f6c0a066780c0a4 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18636/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [v7 01/10] drm/i915/display: Add HDR Capability detection for LSPCON
In reply to Uma ShankarQuoted 41 lines · Uma Shankar
LSPCON firmware exposes HDR capability through
LPCON_CAPABILITIESDPCD register. LSPCON implementations capable of supporting HDR setHDR_CAPABILITYbit inLSPCON_CAPABILITIESto 1. This patch reads the same, detects the HDR capability and adds this tointel_lspconstruct.v2: Addressed Jani Nikula's review comment and fixed the HDR
capability detection logicSigned-off-by Uma Shankar <[email protected]>--- .../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_lspcon.c | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+)drivers/gpu/drm/i915/display/intel_display_types.h +1
-0@@ -1398,6 +1398,7 @@ struct intel_lspcon {bool active;enum drm_lspcon_mode mode;enum lspcon_vendor vendor; +bool hdr_supported; };struct intel_digital_port {drivers/gpu/drm/i915/display/intel_lspcon.c +2
-0@@ -35,6 +35,8 @@#define LSPCON_VENDOR_PARADE_OUI 0x001CF8#define LSPCON_VENDOR_MCA_OUI 0x0060AD +#define DPCD_MCA_LSPCON_HDR_STATUS 0x70003 +/* AUX addresses to write MCA AVI IF */ #define LSPCON_MCA_AVI_IF_WRITE_OFFSET 0x5C0#define LSPCON_MCA_AVI_IF_CTRL 0x5DF
drivers/gpu/drm/i915/display/intel_lspcon.c static bool lspcon_detect_vendor(struct intel_lspcon *lspcon) · line 112
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +4
-0@@ -104,6 +106,32 @@ static bool lspcon_detect_vendor(struct intel_lspcon *lspcon)return true; } +static void lspcon_detect_hdr_capability (struct intel_lspcon *lspcon) +{ +struct intel_digital_port *intel_dig_port = + container_of(lspcon, struct intel_digital_port, lspcon);
s/intel_dig_port/dig_port/ to conform with
commit 7801f3b792b0 ("drm/i915/display: prefer dig_port to reference intel_digital_port")
Quoted 26 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +22
-0+struct drm_device *dev = intel_dig_port->base.base.dev; +struct intel_dp *dp =lspcon_to_intel_dp (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 , + &hdr_caps,1 ); +else +return ; + +if (ret <0 ) { +drm_dbg_kms (dev,"hdr capability detection failed\n" ); + lspcon->hdr_supported = false; +return ; + }else if (hdr_caps &0x1 ) { +drm_dbg_kms (dev,"lspcon capable of HDR\n" ); + lspcon->hdr_supported = true; + } +} +static enum drm_lspcon_mode lspcon_get_current_mode (struct intel_lspcon *lspcon) {enum drm_lspcon_mode current_mode;
drivers/gpu/drm/i915/display/intel_lspcon.c static bool lspcon_init(struct intel_digital_port *dig_port) · line 586
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +2
-0@@ -554,6 +582,8 @@ static bool lspcon_init(struct intel_digital_port *dig_port)return false; } +lspcon_detect_hdr_capability (lspcon); +
This is now too late since we do this after registering the connector. Need to move this to the init stage, but lspcon detection requires hpd detection logic to be enabled, so once I get the hpd init order sorted we need to do this after intel_hpd_init() but before the connector is registered. Hmm, maybe we can actually do it from connector's .late_register() hook?
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +0
-0connector->ycbcr_420_allowed = true; lspcon->active = true;DRM_DEBUG_KMS ("Success: LSPCON init\n" );Signature · 1 line
2.26.2
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [v7 04/10] drm/i915/display: Enable BT2020 for HDR on LSPCON devices
In reply to Uma ShankarQuoted 20 lines · Uma Shankar
Enable Colorspace as BT2020 if driving HDR content.Sending Colorimetry data for HDR using AVI infoframe. LSPCON firmware expects this and though SOC drives DP, for HDMI panel AVI infoframe is sent to the LSPCON device which transfers the same to HDMI sink.
v2: Dropped state managed in drm core as per Jani Nikula's suggestion.
v3: Aligned colorimetry handling for lspcon as per
compute_avi_infoframes, as suggested by Ville.Signed-off-by Uma Shankar <[email protected]>--- drivers/gpu/drm/i915/display/intel_lspcon.c | 25 ++++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_lspcon.c +0
-0
drivers/gpu/drm/i915/display/intel_lspcon.c void lspcon_set_infoframes(struct intel_encoder *encoder, · line 537
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +1
-6@@ -534,12 +534,25 @@ void lspcon_set_infoframes(struct intel_encoder *encoder, frame.avi.colorspace =HDMI_COLORSPACE_RGB ; } -drm_hdmi_avi_infoframe_quant_range (&frame.avi, - conn_state->connector, - adjusted_mode, - crtc_state->limited_color_range ? -HDMI_QUANTIZATION_RANGE_LIMITED : -HDMI_QUANTIZATION_RANGE_FULL ); +drm_hdmi_avi_infoframe_colorspace (&frame.avi, conn_state);
That seems to be a missing part from
commit 9d1bb6f0222c ("drm/i915/dp: Attach colorspace property")
Also looks like
commit 2f146b78d5a9 ("drm/i915: Attach colorspace property and enable modeset") added a bogus lspcon check into intel_hdmi_add_properties(). That should be nuked.
Hmm. This whole thing seems like a total snafu. Since we use AVI IF for lspcon it should follow the HDMI colorimetry stuff, but now it uses some kind of mix of both HDMI and DP. We need to sort this out somehow...
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +6
-0+ +/* nonsense combination */ +drm_WARN_ON (encoder->base.dev, crtc_state->limited_color_range && + crtc_state->output_format !=INTEL_OUTPUT_FORMAT_RGB ); + +if (crtc_state->output_format ==INTEL_OUTPUT_FORMAT_RGB ) {
drivers/gpu/drm/i915/display/intel_lspcon.c void lspcon_set_infoframes(struct intel_encoder *encoder, · line 553
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +10
-0+drm_hdmi_avi_infoframe_quant_range (&frame.avi, + conn_state->connector, + adjusted_mode, + crtc_state->limited_color_range ? +HDMI_QUANTIZATION_RANGE_LIMITED : +HDMI_QUANTIZATION_RANGE_FULL ); + }else { + frame.avi.quantization_range =HDMI_QUANTIZATION_RANGE_DEFAULT ; + frame.avi.ycc_quantization_range =HDMI_YCC_QUANTIZATION_RANGE_LIMITED ; + }
This part looks OK.
drivers/gpu/drm/i915/display/intel_lspcon.c void lspcon_set_infoframes(struct intel_encoder *encoder, · line 555
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +2
-0+ +drm_hdmi_avi_infoframe_content_type (&frame.avi, conn_state);
I don't think we have that property attached to the connector. Probably want a separte patch to add both the prop and this thing.
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +0
-0ret =hdmi_infoframe_pack (&frame, buf,sizeof (buf));if (ret <0 ) {Signature · 1 line
2.26.2
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [v7 01/10] drm/i915/display: Add HDR Capability detection for LSPCON
In reply to Ville SyrjäläQuoted 96 lines
-----Original Message-----
From: Ville Syrjälä <[email protected]>
Sent: Thursday, October 8, 2020 4:25 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]
Subject: Re: [v7 01/10] drm/i915/display: Add HDR Capability detection for LSPCONQuoted 39 lines · Uma Shankar
LSPCON firmware exposes HDR capability through
LPCON_CAPABILITIESDPCD register. LSPCON implementations capable of supporting HDR setHDR_CAPABILITYbit inLSPCON_CAPABILITIESto 1. This patch reads the same, detects the HDR capability and adds this tointel_lspconstruct.v2: Addressed Jani Nikula's review comment and fixed the HDR
capability detection logicSigned-off-by Uma Shankar <[email protected]>--- .../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_lspcon.c | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+)drivers/gpu/drm/i915/display/intel_display_types.h +1
-0@@ -1398,6 +1398,7 @@ struct intel_lspcon {bool active;enum drm_lspcon_mode mode;enum lspcon_vendor vendor; +bool hdr_supported; };struct intel_digital_port {drivers/gpu/drm/i915/display/intel_lspcon.c +0
-0@@ -35,6 +35,8 @@#define LSPCON_VENDOR_PARADE_OUI 0x001CF8 #define
LSPCON_VENDOR_MCA_OUI0x0060ADdrivers/gpu/drm/i915/display/intel_lspcon.c +2
-0+#define DPCD_MCA_LSPCON_HDR_STATUS 0x70003 + /* AUX addresses to write MCA AVI IF */ #defineQuoted 1 line
LSPCON_MCA_AVI_IF_WRITE_OFFSET0x5C0#define
LSPCON_MCA_AVI_IF_CTRLdrivers/gpu/drm/i915/display/intel_lspcon.c static bool lspcon_detect_vendor(struct intel_lspcon *lspcon) · line 112
Quoted 9 lines
0x5DF@@ -104,6 +106,32 @@ static boollspcon_detect_vendor(struct intel_lspcon *lspcon)drivers/gpu/drm/i915/display/intel_lspcon.c +4
-0return true; } +static void lspcon_detect_hdr_capability (struct intel_lspcon *lspcon) +{ +struct intel_digital_port *intel_dig_port = + container_of(lspcon, struct intel_digital_port, lspcon);s/intel_dig_port/dig_port/ to conform with commit
7801f3b792b0("drm/i915/display: preferdig_portto referenceintel_digital_port")drivers/gpu/drm/i915/display/intel_lspcon.c static bool lspcon_detect_vendor(struct intel_lspcon *lspcon)
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +8
-0+struct drm_device *dev = intel_dig_port->base.base.dev; +struct intel_dp *dp =lspcon_to_intel_dp (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,drivers/gpu/drm/i915/display/intel_lspcon.c static bool lspcon_init(struct intel_digital_port
Quoted 18 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +14
-0+ &hdr_caps, 1); + else + return; + +if (ret <0 ) { +drm_dbg_kms (dev,"hdr capability detection failed\n" ); + lspcon->hdr_supported = false; +return ; + }else if (hdr_caps &0x1 ) { +drm_dbg_kms (dev,"lspcon capable of HDR\n" ); + lspcon->hdr_supported = true; + } +} + static enum drm_lspcon_mode lspcon_get_current_mode(struct
intel_lspcon*lspcon) {drivers/gpu/drm/i915/display/intel_lspcon.c +0
-0enum drm_lspcon_mode current_mode;@@ -554,6 +582,8 @@ static bool lspcon_init(struct intel_digital_port
*dig_port)Quoted 3 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +0
-0return false; }
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_lspcon.c static bool lspcon_init(struct intel_digital_port *dig_port) · line 586
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +2
-0+lspcon_detect_hdr_capability (lspcon); +This is now too late since we do this after registering the connector. Need to move this to the init stage, but lspcon detection requires hpd detection logic to be enabled, so once I get the hpd init order sorted we need to do this after
intel_hpd_init()but before the connector is registered. Hmm, maybe we can actually do it from connector's
.late_register() hook?
I am actually calling it from ddi_init itself in patch 3 assuming its just the one hardware which is having issues (not sure if this a limitation for LSPCON generically). So if detection is successful register HDR else let it not get enabled. It doesn't sound good though but was not getting any better ideas ☹.
I think late_register may work out for us.
Regards,
Uma Shankar
Quoted 10 lines
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_lspcon.c +0
-1connector->ycbcr_420_allowed = true; lspcon->active = true;DRM_DEBUG_KMS ("Success: LSPCON init\n" ); --2.26.2
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx