| Message ID | 20201103152834.12727-10-uma.shankar@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v9,01/12] drm/i915/display: Add HDR Capability detection for LSPCON | expand |
On Tue, Nov 03, 2020 at 08:58:31PM +0530, Uma Shankar wrote: > Implement 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. > > Signed-off-by: Uma Shankar <uma.shankar@intel.com> > --- > 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(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c > index f1a927cdf798..81dabffbb3e6 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -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; > diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c > index d83e1d220658..8a4fd8ca8016 100644 > --- a/drivers/gpu/drm/i915/display/intel_lspcon.c > +++ b/drivers/gpu/drm/i915/display/intel_lspcon.c > @@ -486,7 +486,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"); Looks like pointless noise in debug logs. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > + hsw_read_infoframe(encoder, crtc_state, type, > + frame, len); > + } > } > > void lspcon_set_infoframes(struct intel_encoder *encoder, > diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.h b/drivers/gpu/drm/i915/display/intel_lspcon.h > index 42ccb21c908f..d622156d0c4e 100644 > --- a/drivers/gpu/drm/i915/display/intel_lspcon.h > +++ b/drivers/gpu/drm/i915/display/intel_lspcon.h > @@ -37,5 +37,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__ */ > -- > 2.26.2
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index f1a927cdf798..81dabffbb3e6 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -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; diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c index d83e1d220658..8a4fd8ca8016 100644 --- a/drivers/gpu/drm/i915/display/intel_lspcon.c +++ b/drivers/gpu/drm/i915/display/intel_lspcon.c @@ -486,7 +486,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, diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.h b/drivers/gpu/drm/i915/display/intel_lspcon.h index 42ccb21c908f..d622156d0c4e 100644 --- a/drivers/gpu/drm/i915/display/intel_lspcon.h +++ b/drivers/gpu/drm/i915/display/intel_lspcon.h @@ -37,5 +37,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__ */
Implement 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. Signed-off-by: Uma Shankar <uma.shankar@intel.com> --- 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(-)