dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Uma Shankar <uma.shankar@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: ville.syrjala@intel.com, maarten.lankhorst@intel.com
Subject: [v5 11/13] drm/i915:Enabled Modeset when HDR Infoframe changes
Date: Mon, 11 Mar 2019 09:28:02 +0530	[thread overview]
Message-ID: <1552276684-25358-12-git-send-email-uma.shankar@intel.com> (raw)
In-Reply-To: <1552276684-25358-1-git-send-email-uma.shankar@intel.com>

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

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
 drivers/gpu/drm/i915/intel_atomic.c | 15 ++++++++++++++-
 drivers/gpu/drm/i915/intel_hdmi.c   |  4 ++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index da419e1..8d5dd41 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -102,6 +102,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)
 {
@@ -129,7 +139,10 @@ 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_blob_ptr,
+			old_conn_state->base.hdr_output_metadata_blob_ptr))
 		crtc_state->mode_changed = true;
 
 	return 0;
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 0a6d4b7..03a7761 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -792,6 +792,10 @@ void intel_read_infoframe(struct intel_encoder *encoder,
 	struct hdr_static_metadata *hdr_metadata;
 	int ret;
 
+	if (!conn_state->hdr_output_metadata_blob_ptr ||
+		conn_state->hdr_output_metadata_blob_ptr->length == 0)
+		return true;
+
 	hdr_metadata = (struct hdr_static_metadata *)
 			conn_state->hdr_output_metadata_blob_ptr->data;
 
-- 
1.9.1

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

  parent reply	other threads:[~2019-03-11  3:58 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-11  3:57 [v5 00/13] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
2019-03-11  3:57 ` [v5 01/13] drm: Add HDR source metadata property Uma Shankar
2019-03-15  7:08   ` Sharma, Shashank
2019-03-20  6:21     ` Shankar, Uma
2019-03-11  3:57 ` [v5 02/13] drm: Parse HDR metadata info from EDID Uma Shankar
2019-03-15  7:26   ` Sharma, Shashank
2019-03-20  6:37     ` Shankar, Uma
2019-03-11  3:57 ` [v5 03/13] drm: Parse Colorimetry data block " Uma Shankar
2019-03-15  7:30   ` Sharma, Shashank
2019-03-20  7:17     ` Shankar, Uma
2019-03-20  8:15       ` Sharma, Shashank
2019-03-20  8:58         ` Shankar, Uma
2019-03-11  3:57 ` [v5 04/13] drm/i915: Attach HDR metadata property to connector Uma Shankar
2019-03-15  7:36   ` Sharma, Shashank
2019-03-20  7:58     ` Shankar, Uma
2019-03-11  3:57 ` [v5 05/13] drm: Implement HDR output metadata set and get property handling Uma Shankar
2019-03-11  3:57 ` [v5 06/13] drm: Enable HDR infoframe support Uma Shankar
2019-03-15  8:23   ` Sharma, Shashank
2019-03-20  9:24     ` Shankar, Uma
2019-03-11  3:57 ` [v5 07/13] drm/i915: Write HDR infoframe and send to panel Uma Shankar
2019-03-15 11:07   ` Sharma, Shashank
2019-03-20  9:46     ` Shankar, Uma
2019-03-11  3:57 ` [v5 08/13] drm/i915: [DO NOT MERGE] hack for glk board outputs Uma Shankar
2019-03-11  3:58 ` [v5 09/13] drm/i915: Add HLG EOTF Uma Shankar
2019-03-15 11:09   ` Sharma, Shashank
2019-03-11  3:58 ` [v5 10/13] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
2019-03-11  3:58 ` Uma Shankar [this message]
2019-03-11  3:58 ` [v5 12/13] drm/i915: Set Infoframe for non modeset case " Uma Shankar
2019-03-11  3:58 ` [v5 13/13] video/hdmi: Add const variants for drm infoframe Uma Shankar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1552276684-25358-12-git-send-email-uma.shankar@intel.com \
    --to=uma.shankar@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=maarten.lankhorst@intel.com \
    --cc=ville.syrjala@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox