drm/i915: Enabled Modeset when HDR Infoframe changes

This patch enables modeset whenever HDR metadata
needs to be updated to sink.

v2: Addressed Shashank's review comments.

v3: Added Shashank's RB.

v4: Addressed Ville's review comments.

v5: Addressed Ville's review comments.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
[mlankhorst: Fix up commit message, reorder]
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1558015817-12025-10-git-send-email-uma.shankar@intel.com

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 58b8049..6b985e8 100644 (file)
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -105,6 +105,16 @@ 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_connector_state *new_state)
 {
@@ -132,7 +142,9 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
            new_conn_state->base.colorspace != old_conn_state->base.colorspace ||
            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)
+           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))
                crtc_state->mode_changed = true;
 
        return 0;