On Tue, Nov 03, 2020 at 08:58:32PM +0530, Uma Shankar wrote:
> Lspcon 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.
>
> Suggested-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> Signed-off-by: Uma Shankar <uma.shankar@xxxxxxxxx>
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 19b16517a502..d50dd1f1292a 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -4402,6 +4402,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 */
> @@ -4482,9 +4483,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);
> diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c
> index 8a4fd8ca8016..9c8dfd2fb949 100644
> --- a/drivers/gpu/drm/i915/display/intel_lspcon.c
> +++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
> @@ -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
> @@ -667,6 +668,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)
So this is the function I figured should allow us to not to pretend to
use the video DIP bits.
I ttink the actual lspcon infoframes_enabled() could just directly use
intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_AVI) etc. instead
of doing this extra remapping here.
> + 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;
> diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.h b/drivers/gpu/drm/i915/display/intel_lspcon.h
> index d622156d0c4e..e92735408443 100644
> --- a/drivers/gpu/drm/i915/display/intel_lspcon.h
> +++ b/drivers/gpu/drm/i915/display/intel_lspcon.h
> @@ -41,5 +41,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__ */
> --
> 2.26.2
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
