I screwed up a rebase somehow.
Cc: Lubomir Rintel <lkundrak@xxxxx>
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
---
Documentation/gpu/drm-kms-helpers.rst | 4 ++--
drivers/gpu/drm/i915/intel_drv.h | 8 ++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst
index b422eb8edf16..10b62c5441d8 100644
--- a/Documentation/gpu/drm-kms-helpers.rst
+++ b/Documentation/gpu/drm-kms-helpers.rst
@@ -116,8 +116,6 @@ Framebuffer CMA Helper Functions Reference
.. kernel-doc:: drivers/gpu/drm/drm_fb_cma_helper.c
:export:
-.. _drm_bridges:
-
Framebuffer GEM Helper Reference
================================
@@ -127,6 +125,8 @@ Framebuffer GEM Helper Reference
.. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c
:export:
+.. _drm_bridges:
+
Bridges
=======
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 40357e17324e..5eb88244f0b1 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -388,11 +388,15 @@ struct intel_hdcp_shim {
int (*hdcp_2_2_capable)(struct intel_digital_port *intel_dig_port,
bool *capable);
- /* Write HDCP2.2 messages */
+ /* Write HDCP2.2 messages.
+ * We are using HDMI msg-id numbers to identify HDCP2 messages, which *
+ * will be remapped to DP AUX registers for DP. */
int (*write_2_2_msg)(struct intel_digital_port *intel_dig_port,
void *buf, size_t size);
- /* Read HDCP2.2 messages */
+ /* Read HDCP2.2 messages.
+ * We are using HDMI msg-id numbers to identify HDCP2 messages, which *
+ * will be remapped to DP AUX registers for DP. */
int (*read_2_2_msg)(struct intel_digital_port *intel_dig_port,
u8 msg_id, void *buf, size_t size);
--
2.20.0.rc1
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
