YCBCR 4:2:0/4:4:4 output support for LSPCON
Subsystems (2)
v9 cover YCBCR 4:2:0/4:4:4 output support for LSPCON
This patch series adds YCBCR 4:2:0 output support for LSPCON displays. In order to indicate the color format of output, to the LSPCON device, a source has to set and send proper AVI infoframes to LSPCON. So this patch series:
- introduces concept of CRTC output format.
- adds AVI infoframes support for LSPCON.
- then adds YCBCR 4:2:0 and 4:4:4 output support for LSPCON.
Previous versions of this series and its review can be found here:
https://patchwork.freedesktop.org/series/28536/
https://patchwork.freedesktop.org/series/33794/
- In order to address review comment from V2, I have added 2 new patches in this series, hence sent V3, and then V4 and to address additional comments.
- V5 of the series adds a new patch (first patch) just to introduce CRTC_OUTPUT_FORMAT concept, and later adds patches for 4:2:0 and 4:4:4 outputs.
- V6 fixes a warning in CI builds, related to state->get_config().
- V7 fixes alignment warnings from checkpatch.
- V8 fixes more alignment warnings from checkpatch.
- V9 is just with rebase
Sharma, Shashank (2):
drm/i915: Check LSPCON vendor OUI
drm/i915: Write AVI infoframes for MCA LSPCON
Shashank Sharma (6):
drm/i915: Introduce CRTC output format drm/i915: Add CRTC output format YCBCR 4:2:0 drm/i915: Add CRTC output format YCBCR 4:4:4 drm/i915: Add AVI infoframe support for LSPCON drm/i915: Write AVI infoframes for Parade LSPCON drm/i915: Add YCBCR 4:2:0/4:4:4 support for LSPCON
drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_color.c | 3 +- drivers/gpu/drm/i915/intel_crt.c | 3 + drivers/gpu/drm/i915/intel_ddi.c | 28 ++- drivers/gpu/drm/i915/intel_display.c | 104 ++++++++--- drivers/gpu/drm/i915/intel_dp.c | 5 + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 39 +++- drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 24 ++- drivers/gpu/drm/i915/intel_lspcon.c | 339 +++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_lvds.c | 2 + drivers/gpu/drm/i915/intel_panel.c | 2 +- drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 1 + 16 files changed, 498 insertions(+), 58 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 1/8 drm/i915: Introduce CRTC output format
This patch adds an enum "intel_output_format" to represent the output format of a particular CRTC. This enum will be used to produce a RGB/YCBCR4:4:4/YCBCR4:2:0 output format during the atomic modeset calculations.
V5:
- Created this separate patch to introduce and init output_format.
- Initialize parameters of output_format_str respectively (Jani N).
- Call it intel_output_format than crtc_output_format(Ville).
- Set output format in pipe_config for every encoder (Ville).
- Get rid of extra DRM_DEBUG_KMS during get_pipe_config (Ville)
V6: Rebase
V7: Fixed alignment warnings (checkpatch)
V8: Another check[atch warning for alignment
V9: Rebase
--- drivers/gpu/drm/i915/intel_crt.c | 3 +++ drivers/gpu/drm/i915/intel_display.c | 17 +++++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 8 ++++++++ drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 2 ++ drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 1 + 11 files changed, 37 insertions(+)
drivers/gpu/drm/i915/intel_crt.c +3 -0
@@ -337,6 +337,7 @@ static bool intel_crt_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;return true; }
@@ -345,6 +346,7 @@ static bool pch_crt_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) { pipe_config->has_pch_encoder = true; + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ;return true; }
@@ -356,6 +358,7 @@ static bool hsw_crt_compute_config(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); pipe_config->has_pch_encoder = true; + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ;/* LPT FDI RX only supports 8bpc. */ if (HAS_PCH_LPT (dev_priv)) {
drivers/gpu/drm/i915/intel_display.c +17 -0
@@ -9421,6 +9421,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, } } + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ; power_domain =POWER_DOMAIN_PIPE_PANEL_FITTER (crtc->pipe);if (intel_display_power_get_if_enabled (dev_priv, power_domain)) { power_domain_mask |=BIT_ULL (power_domain);
@@ -10753,6 +10754,18 @@ static void snprintf_output_types(char *buf, size_t len,WARN_ON_ONCE (output_types !=0 ); } +static const char *const output_format_str[] = { + [INTEL_OUTPUT_FORMAT_INVALID ] ="Invalid" , + [INTEL_OUTPUT_FORMAT_RGB ] ="RGB" , +}; + +static const char *output_formats (enum intel_output_format format) +{ +if (format !=INTEL_OUTPUT_FORMAT_RGB ) + format =INTEL_OUTPUT_FORMAT_INVALID ; +return output_format_str[format]; +} +static void intel_dump_pipe_config (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config,const char *context)
@@ -10772,6 +10785,9 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("output_types: %s (0x%x)\n" , buf, pipe_config->output_types); +DRM_DEBUG_KMS ("output format: %s\n" , +output_formats (pipe_config->output_format)); +DRM_DEBUG_KMS ("cpu_transcoder: %s, pipe bpp: %i, dithering: %i\n" ,transcoder_name (pipe_config->cpu_transcoder), pipe_config->pipe_bpp, pipe_config->dither);
@@ -11360,6 +11376,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vsync_end);PIPE_CONF_CHECK_I (pixel_multiplier); +PIPE_CONF_CHECK_I (output_format);PIPE_CONF_CHECK_BOOL (has_hdmi_sink);if ((INTEL_GEN (dev_priv) <8 && !IS_HASWELL (dev_priv)) ||IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))
drivers/gpu/drm/i915/intel_dp.c +1 -0
@@ -1834,6 +1834,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,if (HAS_PCH_SPLIT (dev_priv) && !HAS_DDI (dev_priv) && port !=PORT_A ) pipe_config->has_pch_encoder = true; + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ; pipe_config->has_drrs = false;if (IS_G4X (dev_priv) || port ==PORT_A ) pipe_config->has_audio = false;
drivers/gpu/drm/i915/intel_dp_mst.c +1 -0
@@ -48,6 +48,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,bool reduce_m_n =drm_dp_has_quirk (&intel_dp->desc,DP_DPCD_QUIRK_LIMITED_M_N ); + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ; pipe_config->has_pch_encoder = false; bpp =24 ;if (intel_dp->compliance.test_data.bpc) {
drivers/gpu/drm/i915/intel_drv.h +8 -0
@@ -709,6 +709,11 @@ struct intel_crtc_wm_state {bool need_postvbl_update; }; +enum intel_output_format { +INTEL_OUTPUT_FORMAT_INVALID , +INTEL_OUTPUT_FORMAT_RGB , +}; +struct intel_crtc_state {struct drm_crtc_state base;
@@ -898,6 +903,9 @@ struct intel_crtc_state {/* output format is YCBCR 4:2:0 */ bool ycbcr420; + +/* Output format RGB/YCBCR etc */ +enum intel_output_format output_format; };struct intel_crtc {
drivers/gpu/drm/i915/intel_dsi.c +1 -0
@@ -314,6 +314,7 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,int ret;DRM_DEBUG_KMS ("\n" ); + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ;if (fixed_mode) {intel_fixed_panel_mode (fixed_mode, adjusted_mode);
drivers/gpu/drm/i915/intel_dvo.c +1 -0
@@ -250,6 +250,7 @@ static bool intel_dvo_compute_config(struct intel_encoder *encoder,if (fixed_mode)intel_fixed_panel_mode (fixed_mode, adjusted_mode); + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ;return true; }
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
@@ -1664,6 +1664,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,int desired_bpp;bool force_dvi = intel_conn_state->force_audio ==HDMI_AUDIO_OFF_DVI ; + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ; pipe_config->has_hdmi_sink = !force_dvi && intel_hdmi->has_hdmi_sink;if (pipe_config->has_hdmi_sink)
drivers/gpu/drm/i915/intel_lvds.c +2 -0
@@ -418,6 +418,8 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, pipe_config->pipe_bpp = lvds_bpp; } + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ; +/* * We have timings from the BIOS for the panel, put them in * to the adjusted mode. The CRTC will be set up for this mode,
drivers/gpu/drm/i915/intel_sdvo.c +1 -0
@@ -1132,6 +1132,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,DRM_DEBUG_KMS ("forcing bpc to 8 for SDVO\n" ); pipe_config->pipe_bpp =8 *3 ; + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ;if (HAS_PCH_SPLIT (to_i915 (encoder->base.dev))) pipe_config->has_pch_encoder = true;
drivers/gpu/drm/i915/intel_tv.c +1 -0
@@ -877,6 +877,7 @@ intel_tv_compute_config(struct intel_encoder *encoder,if (!tv_mode)return false; + pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ; pipe_config->base.adjusted_mode.crtc_clock = tv_mode->clock;DRM_DEBUG_KMS ("forcing bpc to 8 for TV\n" ); pipe_config->pipe_bpp =8 *3 ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 2/8 drm/i915: Add CRTC output format YCBCR 4:2:0
In reply to Shashank SharmaCurrently, we are using a bool in CRTC state (state->ycbcr420), to indicate modeset, that the output format is YCBCR 4:2:0. Now in order to support other YCBCR formats, we will need more such flags.
This patch adds a new enum parameter for YCBCR 4:2:0 outputs, in the CRTC output formats and then plugs it during the modeset.
V3: Added this patch in the series, to address review comments from
second patchset.
V4: Added r-b from Maarten (on v3)
Addressed review comments from Ville:
- Change the enum name to intel_output_format from crtc_output_format.
- Start the enum value (INVALID) from 0 instaed of 1.
- Set the crtc's output_format to RGB in encoder's compute_config.
V5: Broke previous patch 1 into two parts,
- first patch to add CRTC output format in general
- second patch (this one) to add YCBCR 4:2:0 output
format specifically.
- Use ARRAY_SIZE(format_str) for output format validity check (Ville)
V6: Added a separate function to calculate crtc_state->output_format, and
calling it from various get_config function (Fix CI build warning)
V7: Fixed checkpatch warnings for alignment
V8: Rebase
--- drivers/gpu/drm/i915/intel_color.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 72 +++++++++++++++++++++--------------- drivers/gpu/drm/i915/intel_drv.h | 4 +- drivers/gpu/drm/i915/intel_hdmi.c | 6 +-- drivers/gpu/drm/i915/intel_panel.c | 2 +- 6 files changed, 50 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/intel_color.c +1 -1
@@ -149,7 +149,7 @@ static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state)if (INTEL_GEN (dev_priv) >=8 ||IS_HASWELL (dev_priv)) limited_color_range = intel_crtc_state->limited_color_range; -if (intel_crtc_state->ycbcr420) { +if (intel_crtc_state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 ) {ilk_load_ycbcr_conversion_matrix (intel_crtc);return ; }else if (crtc_state->ctm) {
drivers/gpu/drm/i915/intel_ddi.c +1 -1
@@ -1413,7 +1413,7 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)else dotclock = pipe_config->port_clock; -if (pipe_config->ycbcr420) +if (pipe_config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 ) dotclock *=2 ;if (pipe_config->pixel_multiplier)
drivers/gpu/drm/i915/intel_display.c +43 -29
140 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +1 -3
@@ -712,6 +712,7 @@ struct intel_crtc_wm_state {enum intel_output_format {INTEL_OUTPUT_FORMAT_INVALID ,INTEL_OUTPUT_FORMAT_RGB , +INTEL_OUTPUT_FORMAT_YCBCR420 , };struct intel_crtc_state {
@@ -901,9 +902,6 @@ struct intel_crtc_state {/* HDMI High TMDS char rate ratio */ bool hdmi_high_tmds_clock_ratio; -/* output format is YCBCR 4:2:0 */ -bool ycbcr420; -/* Output format RGB/YCBCR etc */ enum intel_output_format output_format; };
drivers/gpu/drm/i915/intel_hdmi.c +3 -3
@@ -480,7 +480,7 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,return ; } -if (crtc_state->ycbcr420) +if (crtc_state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 ) frame.avi.colorspace =HDMI_COLORSPACE_YUV420 ;else frame.avi.colorspace =HDMI_COLORSPACE_RGB ;
@@ -1599,7 +1599,7 @@ static bool hdmi_12bpc_possible(const struct intel_crtc_state *crtc_state)if (connector_state->crtc != crtc_state->base.crtc)continue ; -if (crtc_state->ycbcr420) { +if (crtc_state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 ) {const struct drm_hdmi_info *hdmi = &info->hdmi;if (!(hdmi->y420_dc_modes &DRM_EDID_YCBCR420_DC_36 ))
@@ -1634,7 +1634,7 @@ intel_hdmi_ycbcr420_config(struct drm_connector *connector, config->port_clock /=2 ; *clock_12bpc /=2 ; *clock_8bpc /=2 ; - config->ycbcr420 = true; + config->output_format =INTEL_OUTPUT_FORMAT_YCBCR420 ;/* YCBCR 420 output conversion needs a scaler */ if (skl_update_scaler_crtc (config)) {
drivers/gpu/drm/i915/intel_panel.c +1 -1
@@ -111,7 +111,7 @@ intel_pch_panel_fitting(struct intel_crtc *intel_crtc,/* Native modes don't need fitting */ if (adjusted_mode->crtc_hdisplay == pipe_config->pipe_src_w && adjusted_mode->crtc_vdisplay == pipe_config->pipe_src_h && - !pipe_config->ycbcr420) + pipe_config->output_format !=INTEL_OUTPUT_FORMAT_YCBCR420 ) goto done;switch (fitting_mode) {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 3/8 drm/i915: Add CRTC output format YCBCR 4:4:4
In reply to Shashank SharmaThis patch adds support for YCBCR 4:4:4 CRTC output format. To do this, this patch extends the existing YCBCR 4:2:0 framework by:
- Adding new parameter in for YCBCR 4:4:4 enum crtc_iutput_format.
- Adding case for YCBCR 4:4:4 in while setting AVI infoframes.
- Adding necessary checks in modeset sequence.
V3: Added this patch in the series
V4: Added r-b from Maarten (for v3)
Addressed review comment from Ville:
Do not use (config->output_format > CRTC_OUTPUT_RGB)
V5: Rebase
V6: Rebase and small change, to accommodate changes in patch 2
V7: Fixed checkpatch alignment warnings
V8: Rebase
--- drivers/gpu/drm/i915/intel_color.c | 3 ++- drivers/gpu/drm/i915/intel_display.c | 13 +++++++++---- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 2 ++ 4 files changed, 14 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_color.c +2 -1
@@ -149,7 +149,8 @@ static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state)if (INTEL_GEN (dev_priv) >=8 ||IS_HASWELL (dev_priv)) limited_color_range = intel_crtc_state->limited_color_range; -if (intel_crtc_state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 ) { +if (intel_crtc_state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 || + intel_crtc_state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR444 ) {ilk_load_ycbcr_conversion_matrix (intel_crtc);return ; }else if (crtc_state->ctm) {
drivers/gpu/drm/i915/intel_display.c +9 -4
@@ -6552,8 +6552,9 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,return -EINVAL ; } -if (pipe_config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 && - pipe_config->base.ctm) { +if ((pipe_config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 || + pipe_config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR444 ) && + pipe_config->base.ctm) {/* * There is only one pipe CSC unit per pipe, and we need that * for output conversion from RGB->YCBCR. So if CTM is already
@@ -7771,6 +7772,8 @@ static void intel_get_crtc_ycbcr_config(struct intel_crtc *crtc, output =INTEL_OUTPUT_FORMAT_INVALID ; else output =INTEL_OUTPUT_FORMAT_YCBCR420 ; + }else { + output =INTEL_OUTPUT_FORMAT_YCBCR444 ; } } }
@@ -8413,11 +8416,13 @@ static void haswell_set_pipemisc(struct drm_crtc *crtc)if (intel_crtc->config->dither) val |=PIPEMISC_DITHER_ENABLE |PIPEMISC_DITHER_TYPE_SP ; -if (config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 ) { +if (config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 || + config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR444 ) val |=PIPEMISC_OUTPUT_COLORSPACE_YUV ; + +if (config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 ) val |=PIPEMISC_YUV420_ENABLE |PIPEMISC_YUV420_MODE_FULL_BLEND ; - }I915_WRITE (PIPEMISC (intel_crtc->pipe), val); }
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -713,6 +713,7 @@ enum intel_output_format {INTEL_OUTPUT_FORMAT_INVALID ,INTEL_OUTPUT_FORMAT_RGB ,INTEL_OUTPUT_FORMAT_YCBCR420 , + INTEL_OUTPUT_FORMAT_YCBCR444, }; struct intel_crtc_state {
drivers/gpu/drm/i915/intel_hdmi.c +2 -0
@@ -482,6 +482,8 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,if (crtc_state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 ) frame.avi.colorspace =HDMI_COLORSPACE_YUV420 ; +else if (crtc_state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR444 ) + frame.avi.colorspace =HDMI_COLORSPACE_YUV444 ;else frame.avi.colorspace =HDMI_COLORSPACE_RGB ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 4/8 drm/i915: Check LSPCON vendor OUI
In reply to Shashank SharmaFrom: "Sharma, Shashank" <[email protected]>
Intel LSPCON chip is provided by 2 vendors:
- Megachips America (MCA)
- Parade technologies (Parade tech)
Its important to know the vendor of this chip, as the address to write AVI infoframes is different for those two.
This patch reads the vendor OUI signature, and marks into LSPCON encoder structure for future usages.
This patch also does a small re-arrangement of the code, by moving lspcon mode change into probe function.
V2: Use dp->desc for OUI detection, dont add a helper for this
(Ville)
V3: Rebase, Added r-b from Maarten
V4: Rebase
V5: Rebase
V6: Rebase
V7: Rebase
--- drivers/gpu/drm/i915/intel_drv.h | 6 ++++ drivers/gpu/drm/i915/intel_lspcon.c | 69 +++++++++++++++++++++++++++++-------- 2 files changed, 61 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +6 -0
@@ -1159,9 +1159,15 @@ struct intel_dp {struct intel_dp_compliance compliance; }; +enum lspcon_vendor { +LSPCON_VENDOR_MCA , +LSPCON_VENDOR_PARADE +}; +struct intel_lspcon {bool active;enum drm_lspcon_mode mode; +enum lspcon_vendor vendor; };struct intel_digital_port {
drivers/gpu/drm/i915/intel_lspcon.c +55 -14
99 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 5/8 drm/i915: Add AVI infoframe support for LSPCON
In reply to Shashank SharmaIn order to pass AVI infoframes to LSPCON devices, a source has to write them in a vendor recommended method and location.
This patch series:
- adds generic LSPCON infoframe setup functions.
- registers these functions into existing AVI infoframe framework.
- triggers these functions from modeset sequence.
Next patches in the series will add vendor specific code.
V2: Added new parameter to align with new definition of
drm_hdmi_avi_infoframe_quant_range
V3: Added r-b from Maarten (for V2)
Added new parameter output_format in struct lspcon to accommodate Ville's review comments on last patch of the series
V4: Addressed Ville's review comment
- Do not add output_format in LSPCON state, as its non-atomic. Add this into CRTC state (added in a later patch).
V5: Rebase
V6: Rebase
V7: Rebase
V8: Rebase
--- drivers/gpu/drm/i915/intel_ddi.c | 19 +++++++++++--- drivers/gpu/drm/i915/intel_drv.h | 13 +++++++++- drivers/gpu/drm/i915/intel_hdmi.c | 13 +++++++--- drivers/gpu/drm/i915/intel_lspcon.c | 49 +++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +15 -4
@@ -2659,10 +2659,22 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder,intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, true); -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) {intel_ddi_pre_enable_hdmi (encoder, crtc_state, conn_state); -else + }else { +struct intel_lspcon *lspcon = +enc_to_intel_lspcon (&encoder->base); +intel_ddi_pre_enable_dp (encoder, crtc_state, conn_state); +if (lspcon->active) { +struct intel_digital_port *dig_port = +enc_to_dig_port (&encoder->base); + + dig_port->set_infoframes (&encoder->base, + crtc_state->has_infoframe, + crtc_state, conn_state); + } + } }static void intel_disable_ddi_buf (struct intel_encoder *encoder)
@@ -3515,8 +3527,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)MISSING_CASE (port); } -intel_infoframe_init (intel_dig_port); -if (init_dp) {if (!intel_ddi_init_dp_connector (intel_dig_port)) goto err;
@@ -3546,6 +3556,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) port_name(port)); } +intel_infoframe_init (intel_dig_port);return ; err:
drivers/gpu/drm/i915/intel_drv.h +12 -1
@@ -1293,6 +1293,12 @@ static inline struct intel_dp *enc_to_intel_dp(struct drm_encoder *encoder)return &enc_to_dig_port (encoder)->dp; } +static inline struct intel_lspcon * +enc_to_intel_lspcon (struct drm_encoder *encoder) +{ +return &enc_to_dig_port (encoder)->lspcon; +} +static inline struct intel_digital_port *dp_to_dig_port (struct intel_dp *intel_dp) {
@@ -1836,7 +1842,6 @@ bool intel_hdmi_handle_sink_scrambling(struct intel_encoder *encoder,void intel_dp_dual_mode_set_tmds_output (struct intel_hdmi *hdmi,bool enable);void intel_infoframe_init (struct intel_digital_port *intel_dig_port); -/* intel_lvds.c */ bool intel_lvds_port_enabled (struct drm_i915_private *dev_priv,i915_reg_t lvds_reg,enum pipe *pipe);
@@ -2162,6 +2167,12 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state);bool lspcon_init (struct intel_digital_port *intel_dig_port);void lspcon_resume (struct intel_lspcon *lspcon);void lspcon_wait_pcon_mode (struct intel_lspcon *lspcon); +void lspcon_set_infoframes (struct drm_encoder *encoder, +bool enable, +const struct intel_crtc_state *crtc_state, +const struct drm_connector_state *conn_state); +bool lspcon_infoframe_enabled (struct drm_encoder *encoder, +const struct intel_crtc_state *pipe_config);/* intel_pipe_crc.c */ int intel_pipe_crc_create (struct drm_minor *minor);
drivers/gpu/drm/i915/intel_hdmi.c +10 -3
@@ -2267,9 +2267,16 @@ void intel_infoframe_init(struct intel_digital_port *intel_dig_port) intel_dig_port->set_infoframes = g4x_set_infoframes; intel_dig_port->infoframe_enabled = g4x_infoframe_enabled; }else if (HAS_DDI (dev_priv)) { - intel_dig_port->write_infoframe = hsw_write_infoframe; - intel_dig_port->set_infoframes = hsw_set_infoframes; - intel_dig_port->infoframe_enabled = hsw_infoframe_enabled; +if (intel_dig_port->lspcon.active) { + intel_dig_port->set_infoframes = lspcon_set_infoframes; + intel_dig_port->infoframe_enabled = + lspcon_infoframe_enabled; + }else { + intel_dig_port->set_infoframes = hsw_set_infoframes; + intel_dig_port->infoframe_enabled = + hsw_infoframe_enabled; + intel_dig_port->write_infoframe = hsw_write_infoframe; + } }else if (HAS_PCH_IBX (dev_priv)) { intel_dig_port->write_infoframe = ibx_write_infoframe; intel_dig_port->set_infoframes = ibx_set_infoframes;
drivers/gpu/drm/i915/intel_lspcon.c +49 -0
55 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 6/8 drm/i915: Write AVI infoframes for MCA LSPCON
In reply to Shashank SharmaFrom: "Sharma, Shashank" <[email protected]>
As LSPCON is a DP branch device, LSPCON vendors define specific methods to pass AVI infoframes to the the chip. This patch adds:
- a generic wrapper function for writing AVI infoframes for all LSPCON devices.
- a vendor specific function to wrire AVI infoframes into MCA LSPCON devices.
V2: Rebase
V3: Added r-b from Maarten
V4: Rebase
V5: Rebase
V6: Rebase
V7: Fixed checkpatch warnings for alignment
V8: Rebase
--- drivers/gpu/drm/i915/intel_drv.h | 4 ++ drivers/gpu/drm/i915/intel_hdmi.c | 2 + drivers/gpu/drm/i915/intel_lspcon.c | 80 +++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+)
drivers/gpu/drm/i915/intel_drv.h +4 -0
@@ -2167,6 +2167,10 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state);bool lspcon_init (struct intel_digital_port *intel_dig_port);void lspcon_resume (struct intel_lspcon *lspcon);void lspcon_wait_pcon_mode (struct intel_lspcon *lspcon); +void lspcon_write_infoframe (struct drm_encoder *encoder, +const struct intel_crtc_state *crtc_state, +unsigned int type, +const void *buf,ssize_t len); void lspcon_set_infoframes(struct drm_encoder *encoder, bool enable, const struct intel_crtc_state *crtc_state,
drivers/gpu/drm/i915/intel_hdmi.c +2 -0
@@ -2268,6 +2268,8 @@ void intel_infoframe_init(struct intel_digital_port *intel_dig_port) intel_dig_port->infoframe_enabled = g4x_infoframe_enabled; }else if (HAS_DDI (dev_priv)) {if (intel_dig_port->lspcon.active) { + intel_dig_port->write_infoframe = + lspcon_write_infoframe; intel_dig_port->set_infoframes = lspcon_set_infoframes; intel_dig_port->infoframe_enabled = lspcon_infoframe_enabled;
drivers/gpu/drm/i915/intel_lspcon.c +80 -0
92 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 5/8 drm/i915: Add AVI infoframe support for LSPCON
In order to pass AVI infoframes to LSPCON devices, a source has to write them in a vendor recommended method and location.
This patch series:
- adds generic LSPCON infoframe setup functions.
- registers these functions into existing AVI infoframe framework.
- triggers these functions from modeset sequence.
Next patches in the series will add vendor specific code.
V2: Added new parameter to align with new definition of
drm_hdmi_avi_infoframe_quant_range
V3: Added r-b from Maarten (for V2)
Added new parameter output_format in struct lspcon to accommodate Ville's review comments on last patch of the series
V4: Addressed Ville's review comment
- Do not add output_format in LSPCON state, as its non-atomic. Add this into CRTC state (added in a later patch).
V5: Rebase
V6: Rebase
V7: Rebase
V8: Rebase
--- drivers/gpu/drm/i915/intel_ddi.c | 19 +++++++++++--- drivers/gpu/drm/i915/intel_drv.h | 13 +++++++++- drivers/gpu/drm/i915/intel_hdmi.c | 13 +++++++--- drivers/gpu/drm/i915/intel_lspcon.c | 49 +++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +15 -4
@@ -2659,10 +2659,22 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder,intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, true); -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) {intel_ddi_pre_enable_hdmi (encoder, crtc_state, conn_state); -else + }else { +struct intel_lspcon *lspcon = +enc_to_intel_lspcon (&encoder->base); +intel_ddi_pre_enable_dp (encoder, crtc_state, conn_state); +if (lspcon->active) { +struct intel_digital_port *dig_port = +enc_to_dig_port (&encoder->base); + + dig_port->set_infoframes (&encoder->base, + crtc_state->has_infoframe, + crtc_state, conn_state); + } + } }static void intel_disable_ddi_buf (struct intel_encoder *encoder)
@@ -3515,8 +3527,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)MISSING_CASE (port); } -intel_infoframe_init (intel_dig_port); -if (init_dp) {if (!intel_ddi_init_dp_connector (intel_dig_port)) goto err;
@@ -3546,6 +3556,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) port_name(port)); } +intel_infoframe_init (intel_dig_port);return ; err:
drivers/gpu/drm/i915/intel_drv.h +12 -1
@@ -1293,6 +1293,12 @@ static inline struct intel_dp *enc_to_intel_dp(struct drm_encoder *encoder)return &enc_to_dig_port (encoder)->dp; } +static inline struct intel_lspcon * +enc_to_intel_lspcon (struct drm_encoder *encoder) +{ +return &enc_to_dig_port (encoder)->lspcon; +} +static inline struct intel_digital_port *dp_to_dig_port (struct intel_dp *intel_dp) {
@@ -1836,7 +1842,6 @@ bool intel_hdmi_handle_sink_scrambling(struct intel_encoder *encoder,void intel_dp_dual_mode_set_tmds_output (struct intel_hdmi *hdmi,bool enable);void intel_infoframe_init (struct intel_digital_port *intel_dig_port); -/* intel_lvds.c */ bool intel_lvds_port_enabled (struct drm_i915_private *dev_priv,i915_reg_t lvds_reg,enum pipe *pipe);
@@ -2162,6 +2167,12 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state);bool lspcon_init (struct intel_digital_port *intel_dig_port);void lspcon_resume (struct intel_lspcon *lspcon);void lspcon_wait_pcon_mode (struct intel_lspcon *lspcon); +void lspcon_set_infoframes (struct drm_encoder *encoder, +bool enable, +const struct intel_crtc_state *crtc_state, +const struct drm_connector_state *conn_state); +bool lspcon_infoframe_enabled (struct drm_encoder *encoder, +const struct intel_crtc_state *pipe_config);/* intel_pipe_crc.c */ int intel_pipe_crc_create (struct drm_minor *minor);
drivers/gpu/drm/i915/intel_hdmi.c +10 -3
@@ -2267,9 +2267,16 @@ void intel_infoframe_init(struct intel_digital_port *intel_dig_port) intel_dig_port->set_infoframes = g4x_set_infoframes; intel_dig_port->infoframe_enabled = g4x_infoframe_enabled; }else if (HAS_DDI (dev_priv)) { - intel_dig_port->write_infoframe = hsw_write_infoframe; - intel_dig_port->set_infoframes = hsw_set_infoframes; - intel_dig_port->infoframe_enabled = hsw_infoframe_enabled; +if (intel_dig_port->lspcon.active) { + intel_dig_port->set_infoframes = lspcon_set_infoframes; + intel_dig_port->infoframe_enabled = + lspcon_infoframe_enabled; + }else { + intel_dig_port->set_infoframes = hsw_set_infoframes; + intel_dig_port->infoframe_enabled = + hsw_infoframe_enabled; + intel_dig_port->write_infoframe = hsw_write_infoframe; + } }else if (HAS_PCH_IBX (dev_priv)) { intel_dig_port->write_infoframe = ibx_write_infoframe; intel_dig_port->set_infoframes = ibx_set_infoframes;
drivers/gpu/drm/i915/intel_lspcon.c +49 -0
55 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 6/8 drm/i915: Write AVI infoframes for MCA LSPCON
In reply to Shashank SharmaFrom: "Sharma, Shashank" <[email protected]>
As LSPCON is a DP branch device, LSPCON vendors define specific methods to pass AVI infoframes to the the chip. This patch adds:
- a generic wrapper function for writing AVI infoframes for all LSPCON devices.
- a vendor specific function to wrire AVI infoframes into MCA LSPCON devices.
V2: Rebase
V3: Added r-b from Maarten
V4: Rebase
V5: Rebase
V6: Rebase
V7: Fixed checkpatch warnings for alignment
V8: Rebase
V9: Added the retry logic, with 50ms incremental delays while
writing AVI IF
--- drivers/gpu/drm/i915/intel_drv.h | 4 ++ drivers/gpu/drm/i915/intel_hdmi.c | 2 + drivers/gpu/drm/i915/intel_lspcon.c | 89 +++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+)
drivers/gpu/drm/i915/intel_drv.h +4 -0
@@ -2167,6 +2167,10 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state);bool lspcon_init (struct intel_digital_port *intel_dig_port);void lspcon_resume (struct intel_lspcon *lspcon);void lspcon_wait_pcon_mode (struct intel_lspcon *lspcon); +void lspcon_write_infoframe (struct drm_encoder *encoder, +const struct intel_crtc_state *crtc_state, +unsigned int type, +const void *buf,ssize_t len); void lspcon_set_infoframes(struct drm_encoder *encoder, bool enable, const struct intel_crtc_state *crtc_state,
drivers/gpu/drm/i915/intel_hdmi.c +2 -0
@@ -2268,6 +2268,8 @@ void intel_infoframe_init(struct intel_digital_port *intel_dig_port) intel_dig_port->infoframe_enabled = g4x_infoframe_enabled; }else if (HAS_DDI (dev_priv)) {if (intel_dig_port->lspcon.active) { + intel_dig_port->write_infoframe = + lspcon_write_infoframe; intel_dig_port->set_infoframes = lspcon_set_infoframes; intel_dig_port->infoframe_enabled = lspcon_infoframe_enabled;
drivers/gpu/drm/i915/intel_lspcon.c +89 -0
101 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 7/8 drm/i915: Write AVI infoframes for Parade LSPCON
In reply to Shashank SharmaDifferent LSPCON vendors specify their custom methods to pass AVI infoframes to the LSPCON chip, so does Parade tech.
This patch adds functions to arrange and write AVI infoframes into Parade LSPCON chips.
V2: rebase
V3: Added r-b from Maarten
V4: rebase
V5: rebase
V6: rebase
V7: Fixed checkpatch warnings for alignment
V8: Rebase
--- drivers/gpu/drm/i915/intel_lspcon.c | 117 +++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_lspcon.c +116 -1
@@ -37,6 +37,12 @@#define LSPCON_MCA_AVI_IF_KICKOFF (1 << 0)#define LSPCON_MCA_AVI_IF_HANDLED (1 << 1) +/* AUX addresses to write Parade AVI IF */ +#define LSPCON_PARADE_AVI_IF_WRITE_OFFSET 0x516 +#define LSPCON_PARADE_AVI_IF_CTRL 0x51E +#define LSPCON_PARADE_AVI_IF_KICKOFF (1 << 7) +#define LSPCON_PARADE_AVI_IF_DATA_SIZE 32 +static struct intel_dp *lspcon_to_intel_dp (struct intel_lspcon *lspcon) { struct intel_digital_port *dig_port =
@@ -240,6 +246,111 @@ static void lspcon_resume_in_pcon_wa(struct intel_lspcon *lspcon)DRM_DEBUG_KMS ("LSPCON DP descriptor mismatch after resume\n" ); } +static bool lspcon_parade_fw_ready (struct drm_dp_aux *aux) +{ +u8 avi_if_ctrl; +u8 retry; +ssize_t ret; + +/* Check if LSPCON FW is ready for data */ +for (retry =0 ; retry <5 ; retry++) { +if (retry) +usleep_range (200 ,300 ); + + ret =drm_dp_dpcd_read (aux,LSPCON_PARADE_AVI_IF_CTRL , + &avi_if_ctrl,1 ); +if (ret <0 ) { +DRM_ERROR ("Failed to read AVI IF control\n" ); +return false; + } + +if ((avi_if_ctrl &LSPCON_PARADE_AVI_IF_KICKOFF ) ==0 ) +return true; + } + +DRM_ERROR ("Parade FW not ready to accept AVI IF\n" ); +return false; +} + +static bool _lspcon_parade_write_infoframe_blocks (struct drm_dp_aux *aux, +uint8_t *avi_buf) +{ +u8 avi_if_ctrl; +u8 block_count =0 ; +u8 *data; +uint16_t reg; +ssize_t ret; + +while (block_count <4 ) { +if (!lspcon_parade_fw_ready (aux)) { +DRM_DEBUG_KMS ("LSPCON FW not ready, block %d\n" , + block_count); +return false; + } + + reg =LSPCON_PARADE_AVI_IF_WRITE_OFFSET ; + data = avi_buf + block_count *8 ; + ret =drm_dp_dpcd_write (aux, reg, data,8 ); +if (ret <0 ) { +DRM_ERROR ("Failed to write AVI IF block %d\n" , + block_count); +return false; + } + +/* +* Once a block of data is written, we have to inform the FW +* about this by writing into avi infoframe control register: +* - set the kickoff bit[7] to 1 +* - write the block no. to bits[1:0] +*/ + reg =LSPCON_PARADE_AVI_IF_CTRL ; + avi_if_ctrl =LSPCON_PARADE_AVI_IF_KICKOFF | block_count; + ret =drm_dp_dpcd_write (aux, reg, &avi_if_ctrl,1 ); +if (ret <0 ) { +DRM_ERROR ("Failed to update (0x%x), block %d\n" , + reg, block_count); +return false; + } + + block_count++; + } + +DRM_DEBUG_KMS ("Wrote AVI IF blocks successfully\n" ); +return true; +} + +static bool _lspcon_write_avi_infoframe_parade (struct drm_dp_aux *aux, +const uint8_t *frame, +ssize_t len) +{ +uint8_t avi_if[LSPCON_PARADE_AVI_IF_DATA_SIZE ] = {1 , }; + +/* +* Parade's frames contains 32 bytes of data, divided +* into 4 frames: +* Token byte (first byte of first frame, must be non-zero) +* HB0 to HB2 from AVI IF (3 bytes header) +* PB0 to PB27 from AVI IF (28 bytes data) +* So it should look like this +* first block: | <token> <HB0-HB2> <DB0-DB3> | +* next 3 blocks: |<DB4-DB11>|<DB12-DB19>|<DB20-DB28>| +*/ + +if (len >LSPCON_PARADE_AVI_IF_DATA_SIZE -1 ) { +DRM_ERROR ("Invalid length of infoframes\n" ); +return false; + } + +memcpy (&avi_if[1 ], frame, len); + +if (!_lspcon_parade_write_infoframe_blocks (aux, avi_if)) { +DRM_DEBUG_KMS ("Failed to write infoframe blocks\n" ); +return false; + } + +return true; +} +static bool _lspcon_write_avi_infoframe_mca (struct drm_dp_aux *aux,const uint8_t *buffer,ssize_t len) {
@@ -295,7 +406,7 @@ void lspcon_write_infoframe(struct drm_encoder *encoder,unsigned int type, const void *frame, ssize_t len) { - bool ret = true; + bool ret;struct intel_dp *intel_dp =enc_to_intel_dp (encoder);struct intel_lspcon *lspcon =enc_to_intel_lspcon (encoder);
@@ -306,6 +417,10 @@ void lspcon_write_infoframe(struct drm_encoder *encoder,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" );return ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 8/8 drm/i915: Add YCBCR 4:2:0/4:4:4 support for LSPCON
In reply to Shashank SharmaLSPCON chips can generate YCBCR outputs, if asked nicely :).
In order to generate YCBCR 4:2:0 outputs, a source must:
- send YCBCR 4:4:4 signals to LSPCON
- program color space as 4:2:0 in AVI infoframes
Whereas for YCBCR 4:4:4 outputs, the source must:
- send YCBCR 4:4:4 signals to LSPCON
- program color space as 4:4:4 in AVI infoframes
So for both 4:2:0 as well as 4:4:4 outputs, we are driving the pipe for YCBCR 4:4:4 output, but AVI infoframe's color space information indicates LSPCON FW to start scaling down from YCBCR 4:4:4 and generate YCBCR 4:2:0 output. As the scaling is done by LSPCON device, we need not to reserve a scaler for 4:2:0 outputs.
V2: rebase
V3: Addressed review comments from Ville
- add enum crtc_output_format instead of bool ycbcr420
- use crtc_output_format=4:4:4 for modeset of LSPCON 4:2:0 output cases in this way we will have YCBCR 4:4:4 framework ready (except the ABI part)
V4: Added r-b from Maarten (for v3)
Addressed review comments from Ville:
- Do not add a non-atomic state variable to determine lspcon output. Instead add bool in CRTC state to indicate lspcon based scaling.
V5: Addressed review comments from Ville:
- Change the state bool name from external scaling to something more relavent.
- Keep the info and adjusted_mode structures const.
- use crtc_state instead of pipe_config.
- Push all the config change into lspcon_ycbcr420_config function.
V6: Rebase, small changes to accommodate changes in patch 2.
V7: Fixed checkpatch warnings for alignment
V8: Rebase
PS: Ignored following warnings to match the current formatting:
drm/i915: Add YCBCR 4:2:0/4:4:4 support for LSPCON
-:53: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV)
#53: FILE: drivers/gpu/drm/i915/i915_reg.h:8721:
+#define TRANS_MSA_SAMPLING_444 (2<<1)
^
-:54: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV)
#54: FILE: drivers/gpu/drm/i915/i915_reg.h:8722:
+#define TRANS_MSA_CLRSP_YCBCR (2<<3)--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ddi.c | 7 +++++++ drivers/gpu/drm/i915/intel_display.c | 12 ++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 4 ++++ drivers/gpu/drm/i915/intel_drv.h | 5 +++++ drivers/gpu/drm/i915/intel_lspcon.c | 26 ++++++++++++++++++++++++++ 6 files changed, 56 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -8821,6 +8821,8 @@ enum skl_power_gate {#define TRANS_MSA_MISC (tran) _MMIO_TRANS2(tran, _TRANSA_MSA_MISC)#define TRANS_MSA_SYNC_CLK (1<<0) +#define TRANS_MSA_SAMPLING_444 (2<<1) +#define TRANS_MSA_CLRSP_YCBCR (2<<3)#define TRANS_MSA_6_BPC (0<<5)#define TRANS_MSA_8_BPC (1<<5)#define TRANS_MSA_10_BPC (2<<5)
drivers/gpu/drm/i915/intel_ddi.c +7 -0
@@ -1648,6 +1648,13 @@ void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state)break ; } +/* +* As per DP 1.2 spec section 2.3.4.3 while sending +* YCBCR 444 signals we should program MSA MISC1/0 fields with +* colorspace information. The output colorspace encoding is BT601. +*/ +if (crtc_state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR444 ) + temp |=TRANS_MSA_SAMPLING_444 |TRANS_MSA_CLRSP_YCBCR ;I915_WRITE (TRANS_MSA_MISC (cpu_transcoder), temp); }
drivers/gpu/drm/i915/intel_display.c +12 -0
@@ -7756,6 +7756,8 @@ static void intel_get_crtc_ycbcr_config(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum intel_output_format output =INTEL_OUTPUT_FORMAT_RGB ; + pipe_config->lspcon_downsampling = false; +if (IS_BROADWELL (dev_priv) ||INTEL_GEN (dev_priv) >=9 ) {u32 tmp =I915_READ (PIPEMISC (crtc->pipe));
@@ -7773,6 +7775,16 @@ static void intel_get_crtc_ycbcr_config(struct intel_crtc *crtc,else output =INTEL_OUTPUT_FORMAT_YCBCR420 ; }else { +/* +* Currently there is no interface defined to +* check user preference between RGB/YCBCR444 +* or YCBCR420. So the only possible case for +* YCBCR444 usage is driving YCBCR420 output +* with LSPCON, when pipe is configured for +* YCBCR444 output and LSPCON takes care of +* downsampling it. +*/ + pipe_config->lspcon_downsampling = true; output =INTEL_OUTPUT_FORMAT_YCBCR444 ; } }
drivers/gpu/drm/i915/intel_dp.c +4 -0
@@ -1823,6 +1823,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); +struct intel_lspcon *lspcon =enc_to_intel_lspcon (&encoder->base);enum port port = encoder->port;struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_connector *intel_connector = intel_dp->attached_connector;
@@ -1835,6 +1836,9 @@ intel_dp_compute_config(struct intel_encoder *encoder, pipe_config->has_pch_encoder = true; pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ; +if (lspcon->active) +lspcon_ycbcr420_config (&intel_connector->base, pipe_config); + pipe_config->has_drrs = false;if (IS_G4X (dev_priv) || port ==PORT_A ) pipe_config->has_audio = false;
drivers/gpu/drm/i915/intel_drv.h +5 -0
@@ -905,6 +905,9 @@ struct intel_crtc_state {/* Output format RGB/YCBCR etc */ enum intel_output_format output_format; + +/* Output down scaling is done in LSPCON device */ +bool lspcon_downsampling; };struct intel_crtc {
@@ -2177,6 +2180,8 @@ void lspcon_set_infoframes(struct drm_encoder *encoder, const struct drm_connector_state *conn_state);bool lspcon_infoframe_enabled (struct drm_encoder *encoder,const struct intel_crtc_state *pipe_config); +void lspcon_ycbcr420_config (struct drm_connector *connector, +struct intel_crtc_state *crtc_state);/* intel_pipe_crc.c */ int intel_pipe_crc_create (struct drm_minor *minor);
drivers/gpu/drm/i915/intel_lspcon.c +26 -0
@@ -180,6 +180,21 @@ static bool lspcon_wake_native_aux_ch(struct intel_lspcon *lspcon)return true; } +void lspcon_ycbcr420_config (struct drm_connector *connector, +struct intel_crtc_state *crtc_state) +{ +const struct drm_display_info *info = &connector->display_info; +const struct drm_display_mode *adjusted_mode = + &crtc_state->base.adjusted_mode; + +if (drm_mode_is_420_only (info, adjusted_mode) && + connector->ycbcr_420_allowed) { + crtc_state->port_clock /=2 ; + crtc_state->output_format =INTEL_OUTPUT_FORMAT_YCBCR444 ; + crtc_state->lspcon_downsampling = true; + } +} +static bool lspcon_probe (struct intel_lspcon *lspcon) {int retry;
@@ -456,6 +471,15 @@ void lspcon_set_infoframes(struct drm_encoder *encoder,return ; } +if (crtc_state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR444 ) { +if (crtc_state->lspcon_downsampling) + frame.avi.colorspace =HDMI_COLORSPACE_YUV420 ; +else + frame.avi.colorspace =HDMI_COLORSPACE_YUV444 ; + }else { + frame.avi.colorspace =HDMI_COLORSPACE_RGB ; + } + drm_hdmi_avi_infoframe_quant_range(&frame.avi, mode, crtc_state->limited_color_range ? HDMI_QUANTIZATION_RANGE_LIMITED :
@@ -509,6 +533,7 @@ bool lspcon_init(struct intel_digital_port *intel_dig_port)struct intel_lspcon *lspcon = &intel_dig_port->lspcon;struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_connector *connector = &dp->attached_connector->base;if (!HAS_LSPCON (dev_priv)) {DRM_ERROR ("LSPCON is not supported on this platform\n" );
@@ -533,6 +558,7 @@ bool lspcon_init(struct intel_digital_port *intel_dig_port)return false; } + connector->ycbcr_420_allowed = true; lspcon->active = true;DRM_DEBUG_KMS ("Success: LSPCON init\n" );return true;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for YCBCR 4:2:0/4:4:4 output support for LSPCON (rev8)
In reply to Shashank Sharma== Series Details ==
== Series Details ==
Series: YCBCR 4:2:0/4:4:4 output support for LSPCON (rev8)
URL : https://patchwork.freedesktop.org/series/36068/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
15891a2047c1 drm/i915: Introduce CRTC output format
22f13096d17e drm/i915: Add CRTC output format YCBCR 4:2:0
67ec2782ab55 drm/i915: Add CRTC output format YCBCR 4:4:4
7cdafd96c1e4 drm/i915: Check LSPCON vendor OUI
e15310784af1 drm/i915: Add AVI infoframe support for LSPCON
42085377b498 drm/i915: Write AVI infoframes for MCA LSPCON
6fcc9ce4c7b3 drm/i915: Write AVI infoframes for Parade LSPCON
cab98d0b19ea drm/i915: Add YCBCR 4:2:0/4:4:4 support for LSPCON
-:65: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV)
#65: FILE: drivers/gpu/drm/i915/i915_reg.h:8834:
+#define TRANS_MSA_SAMPLING_444 (2<<1)
^-:66: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #66: FILE: drivers/gpu/drm/i915/i915_reg.h:8835:
+#define TRANS_MSA_CLRSP_YCBCR (2<<3)
^
total: 0 errors, 0 warnings, 2 checks, 128 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for YCBCR 4:2:0/4:4:4 output support for LSPCON (rev8)
In reply to Shashank Sharma== Series Details ==
== Series Details ==
Series: YCBCR 4:2:0/4:4:4 output support for LSPCON (rev8)
URL : https://patchwork.freedesktop.org/series/36068/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4256 -> Patchwork_9147 =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9147 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9147, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/36068/revisions/8/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9147:
=== IGT changes ===
==== Possible regressions ====
igt@gem_exec_suspend@basic-s4-devices:
fi-cfl-s3: PASS -> DMESG-WARN +45
igt@kms_busy@basic-flip-a:
fi-kbl-7567u: PASS -> DMESG-WARN +29
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9147 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@debugfs_test@read_all_entries:
fi-snb-2520m: PASS -> INCOMPLETE (fdo#103713)
igt@kms_frontbuffer_tracking@basic:
fi-hsw-4200u: PASS -> DMESG-FAIL (fdo#102614, fdo#106103)
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: PASS -> FAIL (fdo#104008)
==== Possible fixes ====
igt@prime_vgem@basic-fence-flip:
fi-bwr-2160: FAIL (fdo#103182) -> PASS fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103182 https://bugs.freedesktop.org/show_bug.cgi?id=103182
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#106103 https://bugs.freedesktop.org/show_bug.cgi?id=106103
== Participating hosts (45 -> 39) ==
Missing (6): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-cfl-u2 fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4256 -> Patchwork_9147
CI_DRM_4256: 02a9ddab7c0319d16af25f22f9b15b271e6bbc8f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4500: 43f7a746ac092e41d4745ed190d4268ef1f82c55 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9147: cab98d0b19ea3480c673b95018780c905bc007ec @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
cab98d0b19ea drm/i915: Add YCBCR 4:2:0/4:4:4 support for LSPCON 6fcc9ce4c7b3 drm/i915: Write AVI infoframes for Parade LSPCON 42085377b498 drm/i915: Write AVI infoframes for MCA LSPCON e15310784af1 drm/i915: Add AVI infoframe support for LSPCON 7cdafd96c1e4 drm/i915: Check LSPCON vendor OUI 67ec2782ab55 drm/i915: Add CRTC output format YCBCR 4:4:4 22f13096d17e drm/i915: Add CRTC output format YCBCR 4:2:0 15891a2047c1 drm/i915: Introduce CRTC output format
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9147/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for YCBCR 4:2:0/4:4:4 output support for LSPCON (rev10)
In reply to Shashank Sharma== Series Details ==
== Series Details ==
Series: YCBCR 4:2:0/4:4:4 output support for LSPCON (rev10)
URL : https://patchwork.freedesktop.org/series/36068/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
7a5cc3d707e1 drm/i915: Introduce CRTC output format
c13825908501 drm/i915: Add CRTC output format YCBCR 4:2:0
adcb876048a0 drm/i915: Add CRTC output format YCBCR 4:4:4
ca98d4d54e5c drm/i915: Check LSPCON vendor OUI
494cd85b5f9f drm/i915: Add AVI infoframe support for LSPCON
d95c64d8e00c drm/i915: Write AVI infoframes for MCA LSPCON
-:93: CHECK:BRACES: Blank lines aren't necessary after an open brace '{'
#93: FILE: drivers/gpu/drm/i915/intel_lspcon.c:254:
+ while (val < len) {
+-:97: CHECK:BRACES: braces {} should be used on all arms of this statement #97: FILE: drivers/gpu/drm/i915/intel_lspcon.c:258:
+ if (!ret)
[...]
+ else if (retry < 4) {
[...]
+ } else {
[...]
total: 0 errors, 0 warnings, 2 checks, 119 lines checked ef990435585d drm/i915: Write AVI infoframes for Parade LSPCON d16c8370652c drm/i915: Add YCBCR 4:2:0/4:4:4 support for LSPCON -:65: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #65: FILE: drivers/gpu/drm/i915/i915_reg.h:8845:
+#define TRANS_MSA_SAMPLING_444 (2<<1)
^
-:66: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #66: FILE: drivers/gpu/drm/i915/i915_reg.h:8846:
+#define TRANS_MSA_CLRSP_YCBCR (2<<3)
^
total: 0 errors, 0 warnings, 2 checks, 128 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for YCBCR 4:2:0/4:4:4 output support for LSPCON (rev10)
In reply to Shashank Sharma== Series Details ==
== Series Details ==
Series: YCBCR 4:2:0/4:4:4 output support for LSPCON (rev10)
URL : https://patchwork.freedesktop.org/series/36068/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4278 -> Patchwork_9196 =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9196 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9196, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/36068/revisions/10/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9196:
=== IGT changes ===
==== Possible regressions ====
igt@gem_exec_suspend@basic-s4-devices:
fi-cfl-s3: PASS -> DMESG-WARN +44
igt@kms_busy@basic-flip-a:
fi-kbl-7567u: PASS -> DMESG-WARN +29
==== Warnings ====
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-cfl-s3: FAIL (fdo#100368) -> DMESG-WARN== Known issues ==
Here are the changes found in Patchwork_9196 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s3:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106097)
igt@kms_flip@basic-plain-flip:
fi-elk-e7500: PASS -> DMESG-WARN (fdo#105225) +1
==== Possible fixes ====
igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
fi-glk-j4005: FAIL (fdo#103481) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103481 https://bugs.freedesktop.org/show_bug.cgi?id=103481
fdo#105225 https://bugs.freedesktop.org/show_bug.cgi?id=105225
fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
== Participating hosts (40 -> 38) ==
Additional (2): fi-bxt-dsi fi-hsw-4200u
Missing (4): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4278 -> Patchwork_9196
CI_DRM_4278: 6832f9f1d1d74ea696ae703d6ce9aa195be663f2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4506: 6c9d04797b7ef972b1b3746df6985071d1d2de26 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9196: d16c8370652cb324450e3d12bb0b4e995e609b78 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d16c8370652c drm/i915: Add YCBCR 4:2:0/4:4:4 support for LSPCON ef990435585d drm/i915: Write AVI infoframes for Parade LSPCON d95c64d8e00c drm/i915: Write AVI infoframes for MCA LSPCON 494cd85b5f9f drm/i915: Add AVI infoframe support for LSPCON ca98d4d54e5c drm/i915: Check LSPCON vendor OUI adcb876048a0 drm/i915: Add CRTC output format YCBCR 4:4:4 c13825908501 drm/i915: Add CRTC output format YCBCR 4:2:0 7a5cc3d707e1 drm/i915: Introduce CRTC output format
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9196/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for YCBCR 4:2:0/4:4:4 output support for LSPCON (rev10)
In reply to Shashank Sharma== Series Details ==
== Series Details ==
Series: YCBCR 4:2:0/4:4:4 output support for LSPCON (rev10)
URL : https://patchwork.freedesktop.org/series/36068/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4278_full -> Patchwork_9196_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9196_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9196_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/36068/revisions/10/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9196_full:
=== IGT changes ===
==== Possible regressions ====
igt@kms_flip@wf_vblank-ts-check-interruptible:
shard-kbl: PASS -> DMESG-WARN +533
igt@kms_rotation_crc@sprite-rotation-90-pos-100-0:
shard-apl: PASS -> DMESG-WARN +528
==== Warnings ====
igt@gem_exec_schedule@deep-bsd2:
shard-kbl: PASS -> SKIP +1
igt@kms_available_modes_crc@available_mode_test_crc:
shard-kbl: FAIL (fdo#106641) -> DMESG-FAIL== Known issues ==
Here are the changes found in Patchwork_9196_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@2x-plain-flip-ts-check-interruptible:
shard-glk: PASS -> FAIL (fdo#100368) +1
igt@kms_flip_tiling@flip-x-tiled:
shard-glk: PASS -> FAIL (fdo#104724)
igt@kms_setmode@basic:
shard-apl: PASS -> DMESG-FAIL (fdo#99912)
==== Possible fixes ====
igt@gem_eio@suspend:
shard-snb: INCOMPLETE (fdo#105411) -> PASS
igt@gem_exec_big:
shard-hsw: INCOMPLETE (fdo#103540) -> PASS
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing:
shard-glk: FAIL (fdo#105703) -> PASS +1
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: FAIL (fdo#105454, fdo#106509) -> PASS
igt@kms_cursor_legacy@cursor-vs-flip-varying-size:
shard-hsw: FAIL (fdo#103355) -> PASS
igt@kms_flip@2x-flip-vs-wf_vblank-interruptible:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_flip_tiling@flip-y-tiled:
shard-glk: FAIL (fdo#104724) -> PASS
igt@perf@polling:
shard-hsw: FAIL (fdo#102252) -> PASS
==== Warnings ====
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> DMESG-FAIL (fdo#99912) fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#103355 https://bugs.freedesktop.org/show_bug.cgi?id=103355
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#105703 https://bugs.freedesktop.org/show_bug.cgi?id=105703
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4278 -> Patchwork_9196
CI_DRM_4278: 6832f9f1d1d74ea696ae703d6ce9aa195be663f2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4506: 6c9d04797b7ef972b1b3746df6985071d1d2de26 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9196: d16c8370652cb324450e3d12bb0b4e995e609b78 @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9196/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx