All of 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: dcastagna@chromium.org, seanpaul@chromium.org,
	ville.syrjala@intel.com, maarten.lankhorst@intel.com
Subject: [v7 8/9] drm/i915:Enabled Modeset when HDR Infoframe changes
Date: Wed,  3 Apr 2019 01:50:29 +0530	[thread overview]
Message-ID: <1554236430-7466-9-git-send-email-uma.shankar@intel.com> (raw)
In-Reply-To: <1554236430-7466-1-git-send-email-uma.shankar@intel.com>

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

v2: Addressed Shashank's review comments.

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 | 14 +++++++++++++-
 drivers/gpu/drm/i915/intel_hdmi.c   |  9 +++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index b844e88..f2dcc59 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,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_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 9848e68..64c5b59 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -795,11 +795,20 @@ void intel_read_infoframe(struct intel_encoder *encoder,
 {
 	struct hdmi_drm_infoframe *frame = &crtc_state->infoframes.drm.drm;
 	struct hdr_output_metadata *hdr_metadata;
+	struct drm_connector *connector = conn_state->connector;
 	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_output_metadata *)
 			conn_state->hdr_output_metadata_blob_ptr->data;
 
+	if (!(connector->hdr_metadata.hdmi_type1.eotf &
+	    hdr_metadata->hdmi_type1.eotf))
+		return true;
+
 	ret = drm_hdmi_infoframe_set_hdr_metadata(frame, hdr_metadata);
 	if (ret < 0) {
 		DRM_ERROR("couldn't set HDR metadata in infoframe\n");
-- 
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-04-02 20:20 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-02 20:20 [v7 0/9] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
2019-04-02 20:14 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev7) Patchwork
2019-04-02 20:20 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-04-02 20:20 ` [v7 1/9] drm: Add HDR source metadata property Uma Shankar
2019-04-02 20:39   ` Sam Ravnborg
2019-04-08 10:20   ` Jonas Karlman
2019-04-09 16:17     ` Shankar, Uma
2019-04-02 20:20 ` [v7 2/9] drm: Parse HDR metadata info from EDID Uma Shankar
2019-04-02 20:20 ` [v7 3/9] drm: Enable HDR infoframe support Uma Shankar
2019-04-02 20:37   ` Sam Ravnborg
2019-04-02 20:20 ` [v7 4/9] drm/i915: Attach HDR metadata property to connector Uma Shankar
2019-04-02 20:20 ` [v7 5/9] drm/i915: Write HDR infoframe and send to panel Uma Shankar
2019-04-02 20:20 ` [v7 6/9] drm/i915: Add HLG EOTF Uma Shankar
2019-04-02 20:20 ` [v7 7/9] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
2019-04-02 20:20 ` Uma Shankar [this message]
2019-04-02 20:20 ` [v7 9/9] drm/i915: Set Infoframe for non modeset case " Uma Shankar
2019-04-02 21:15 ` ✗ Fi.CI.BAT: failure for Add HDR Metadata Parsing and handling in DRM layer (rev7) Patchwork
2019-04-08  9:31 ` [v7 0/9] Add HDR Metadata Parsing and handling in DRM layer Sharma, Shashank

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=1554236430-7466-9-git-send-email-uma.shankar@intel.com \
    --to=uma.shankar@intel.com \
    --cc=dcastagna@chromium.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=maarten.lankhorst@intel.com \
    --cc=seanpaul@chromium.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.