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.shan...@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 cc0eb585c654..50bbe3bdb4c7 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 70f4ae6bbda9..357b54a501e8 100644
--- a/drivers/gpu/drm/i915/display/intel_lspcon.c
+++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
@@ -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,
diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.h 
b/drivers/gpu/drm/i915/display/intel_lspcon.h
index 9505e234e2fd..b1f45bd14409 100644
--- a/drivers/gpu/drm/i915/display/intel_lspcon.h
+++ b/drivers/gpu/drm/i915/display/intel_lspcon.h
@@ -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__ */
-- 
2.26.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to