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: [v4 12/12] drm/i915:Enabled Modeset when HDR Infoframe changes
Date: Tue,  8 Jan 2019 14:41:27 +0530	[thread overview]
Message-ID: <1546938687-27306-13-git-send-email-uma.shankar@intel.com> (raw)
In-Reply-To: <1546938687-27306-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 fdfc742..d745f6c 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -101,6 +101,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)
 {
@@ -127,7 +137,10 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
 	    new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb ||
 	    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 c4657f5..7d530da 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -491,6 +491,10 @@ static void intel_hdmi_set_drm_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;
+
 	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-01-08  9:11 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-08  9:11 [v4 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
2019-01-08  9:11 ` [v4 01/12] drm: Add HDR source metadata property Uma Shankar
2019-01-09  0:51   ` [Intel-gfx] " kbuild test robot
2019-01-10 11:03   ` Liviu Dudau
2019-01-08  9:11 ` [v4 02/12] drm: Parse HDR metadata info from EDID Uma Shankar
2019-01-08  9:11 ` [v4 03/12] drm: Parse Colorimetry data block " Uma Shankar
2019-01-09  2:57   ` [Intel-gfx] " kbuild test robot
2019-01-08  9:11 ` [v4 04/12] drm/i915: Attach HDR metadata property to connector Uma Shankar
2019-01-08  9:11 ` [v4 05/12] drm: Add HDR capability field to plane structure Uma Shankar
2019-01-09  5:09   ` kbuild test robot
2019-01-10 10:47   ` Liviu Dudau
2019-01-10 11:45     ` Shankar, Uma
2019-01-08  9:11 ` [v4 06/12] drm: Implement HDR output metadata set and get property handling Uma Shankar
2019-01-08  9:11 ` [v4 07/12] drm: Enable HDR infoframe support Uma Shankar
2019-01-09  2:19   ` kbuild test robot
2019-01-09  7:19   ` kbuild test robot
2019-01-08  9:11 ` [v4 08/12] drm/i915: Write HDR infoframe and send to panel Uma Shankar
2019-01-08  9:11 ` [v4 09/12] drm/i915: [DO NOT MERGE] hack for glk board outputs Uma Shankar
2019-01-08  9:11 ` [v4 10/12] drm/i915: Add HLG EOTF Uma Shankar
2019-01-08 19:45   ` Matt Roper
2019-01-09 12:08     ` Shankar, Uma
2019-01-08  9:11 ` [v4 11/12] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
2019-01-08  9:11 ` Uma Shankar [this message]

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=1546938687-27306-13-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