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 08/12] drm/i915: Write HDR infoframe and send to panel
Date: Tue, 8 Jan 2019 14:41:23 +0530 [thread overview]
Message-ID: <1546938687-27306-9-git-send-email-uma.shankar@intel.com> (raw)
In-Reply-To: <1546938687-27306-1-git-send-email-uma.shankar@intel.com>
Enable writing of HDR metadata infoframe to panel.
The data will be provid by usersapace compositors, based
on blending policies and passsed to driver through a blob
property.
v2: Rebase
v3: Fixed a warning message
v4: Addressed Shashank's review comments
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/intel_hdmi.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 4adda61..8f2be2b 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -475,6 +475,30 @@ static void intel_write_infoframe(struct intel_encoder *encoder,
frame->any.type, buffer, len);
}
+/* Set Dynamic Range and Mastering Infoframe */
+static void intel_hdmi_set_drm_infoframe(struct intel_encoder *encoder,
+ const struct intel_crtc_state
+ *crtc_state,
+ const struct drm_connector_state
+ *conn_state)
+{
+ union hdmi_infoframe frame;
+ struct hdr_static_metadata *hdr_metadata;
+ int ret;
+
+ hdr_metadata = (struct hdr_static_metadata *)
+ conn_state->hdr_output_metadata_blob_ptr->data;
+
+ ret = drm_hdmi_infoframe_set_hdr_metadata(&frame.drm, hdr_metadata);
+ if (ret < 0) {
+ DRM_ERROR("couldn't set HDR metadata in infoframe\n");
+ return;
+ }
+
+ /* Todo: Need to extend support for LSPCON devices as well */
+ intel_write_infoframe(encoder, crtc_state, &frame);
+}
+
static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state)
@@ -883,6 +907,10 @@ static void hsw_set_infoframes(struct intel_encoder *encoder,
intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
intel_hdmi_set_spd_infoframe(encoder, crtc_state);
intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
+
+ /* Set Dynamic Range and Mastering Infoframe if supported and changed */
+ if (conn_state->hdr_metadata_changed)
+ intel_hdmi_set_drm_infoframe(encoder, crtc_state, conn_state);
}
void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev 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 ` Uma Shankar [this message]
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 ` [v4 12/12] drm/i915:Enabled Modeset when HDR Infoframe changes 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=1546938687-27306-9-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