connector: Add helper to compare HDR metadata

Harry Wentland Fri, 19 Mar 2021 13:37:49 -0700

On 2021-03-19 8:49 a.m., Maxime Ripard wrote:

All the drivers that support the HDR metadata property have a similar
function to compare the metadata from one connector state to the next,
and force a mode change if they differ.


All these functions run pretty much the same code, so let's turn it into
an helper that can be shared across those drivers.

Signed-off-by: Maxime Ripard <max...@cerno.tech>


Patches 1 & 2 are
Reviewed-by: Harry Wentland <harry.wentl...@amd.com>

Harry

---
  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 21 +-------------
  drivers/gpu/drm/bridge/synopsys/dw-hdmi.c     | 17 +----------
  drivers/gpu/drm/drm_connector.c               | 28 +++++++++++++++++++
  drivers/gpu/drm/i915/display/intel_atomic.c   | 13 +--------
  include/drm/drm_connector.h                   |  2 ++
  5 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 06908a3cee0f..4eb5201e566a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5924,25 +5924,6 @@ static int fill_hdr_info_packet(const struct 
drm_connector_state *state,
        return 0;
  }

-static bool

-is_hdr_metadata_different(const struct drm_connector_state *old_state,
-                         const struct drm_connector_state *new_state)
-{
-       struct drm_property_blob *old_blob = old_state->hdr_output_metadata;
-       struct drm_property_blob *new_blob = new_state->hdr_output_metadata;
-
-       if (old_blob != new_blob) {
-               if (old_blob && new_blob &&
-                   old_blob->length == new_blob->length)
-                       return memcmp(old_blob->data, new_blob->data,
-                                     old_blob->length);
-
-               return true;
-       }
-
-       return false;
-}
-
  static int
  amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
                                 struct drm_atomic_state *state)
@@ -5960,7 +5941,7 @@ amdgpu_dm_connector_atomic_check(struct drm_connector 
*conn,
        if (!crtc)
                return 0;

- if (is_hdr_metadata_different(old_con_state, new_con_state)) {

+       if (!drm_connector_atomic_hdr_metadata_equal(old_con_state, 
new_con_state)) {
                struct dc_info_packet hdr_infopacket;

ret = fill_hdr_info_packet(new_con_state, &hdr_infopacket);

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c 
b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index f24bbb840dbf..f871e33c2fc9 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -2395,21 +2395,6 @@ static int dw_hdmi_connector_get_modes(struct 
drm_connector *connector)
        return ret;
  }

-static bool hdr_metadata_equal(const struct drm_connector_state *old_state,

-                              const struct drm_connector_state *new_state)
-{
-       struct drm_property_blob *old_blob = old_state->hdr_output_metadata;
-       struct drm_property_blob *new_blob = new_state->hdr_output_metadata;
-
-       if (!old_blob || !new_blob)
-               return old_blob == new_blob;
-
-       if (old_blob->length != new_blob->length)
-               return false;
-
-       return !memcmp(old_blob->data, new_blob->data, old_blob->length);
-}
-
  static int dw_hdmi_connector_atomic_check(struct drm_connector *connector,
                                          struct drm_atomic_state *state)
  {
@@ -2423,7 +2408,7 @@ static int dw_hdmi_connector_atomic_check(struct 
drm_connector *connector,
        if (!crtc)
                return 0;

- if (!hdr_metadata_equal(old_state, new_state)) {

+       if (!drm_connector_atomic_hdr_metadata_equal(old_state, new_state)) {
                crtc_state = drm_atomic_get_crtc_state(state, crtc);
                if (IS_ERR(crtc_state))
                        return PTR_ERR(crtc_state);
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index e25248e23e18..d781a3a1e9bf 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -2170,6 +2170,34 @@ int 
drm_connector_attach_hdr_output_metadata_property(struct drm_connector *conn
  }
  EXPORT_SYMBOL(drm_connector_attach_hdr_output_metadata_property);

+/**

+ * drm_connector_atomic_hdr_metadata_equal - checks if the hdr metadata changed
+ * @old_state: old connector state to compare
+ * @new_state: new connector state to compare
+ *
+ * This is used by HDR-enabled drivers to test whether the HDR metadata
+ * have changed between two different connector state (and thus probably
+ * requires a full blown mode change).
+ *
+ * Returns:
+ * True if the metadata are equal, False otherwise
+ */
+bool drm_connector_atomic_hdr_metadata_equal(struct drm_connector_state 
*old_state,
+                                            struct drm_connector_state 
*new_state)
+{
+       struct drm_property_blob *old_blob = old_state->hdr_output_metadata;
+       struct drm_property_blob *new_blob = new_state->hdr_output_metadata;
+
+       if (!old_blob || !new_blob)
+               return old_blob == new_blob;
+
+       if (old_blob->length != new_blob->length)
+               return false;
+
+       return !memcmp(old_blob->data, new_blob->data, old_blob->length);
+}
+EXPORT_SYMBOL(drm_connector_atomic_hdr_metadata_equal);
+
  /**
   * drm_connector_set_vrr_capable_property - sets the variable refresh rate
   * capable property for a connector
diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c 
b/drivers/gpu/drm/i915/display/intel_atomic.c
index e00fdc47c0eb..efec9454af5a 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -109,16 +109,6 @@ int intel_digital_connector_atomic_set_property(struct 
drm_connector *connector,
        return -EINVAL;
  }

-static bool blob_equal(const struct drm_property_blob *a,

-                      const struct drm_property_blob *b)
-{
-       if (a && b)
-               return a->length == b->length &&
-                       !memcmp(a->data, b->data, a->length);
-
-       return !a == !b;
-}
-
  int intel_digital_connector_atomic_check(struct drm_connector *conn,
                                         struct drm_atomic_state *state)
  {
@@ -149,8 +139,7 @@ int intel_digital_connector_atomic_check(struct 
drm_connector *conn,
            new_conn_state->base.picture_aspect_ratio != 
old_conn_state->base.picture_aspect_ratio ||
            new_conn_state->base.content_type != 
old_conn_state->base.content_type ||
            new_conn_state->base.scaling_mode != 
old_conn_state->base.scaling_mode ||
-           !blob_equal(new_conn_state->base.hdr_output_metadata,
-                       old_conn_state->base.hdr_output_metadata))
+           !drm_connector_atomic_hdr_metadata_equal(old_state, new_state))
                crtc_state->mode_changed = true;

return 0;

diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 32172dab8427..1f51d73ca715 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1672,6 +1672,8 @@ int drm_connector_attach_scaling_mode_property(struct 
drm_connector *connector,
  int drm_connector_attach_vrr_capable_property(
                struct drm_connector *connector);
  int drm_connector_attach_hdr_output_metadata_property(struct drm_connector 
*connector);
+bool drm_connector_atomic_hdr_metadata_equal(struct drm_connector_state 
*old_state,
+                                            struct drm_connector_state 
*new_state);
  int drm_mode_create_aspect_ratio_property(struct drm_device *dev);
  int drm_mode_create_hdmi_colorspace_property(struct drm_connector *connector);
  int drm_mode_create_dp_colorspace_property(struct drm_connector *connector);

Re: [PATCH 2/3] drm/connector: Add helper to compare HDR metadata

Reply via email to