On Thu, 2018-12-20 at 08:08 +0100, Daniel Vetter wrote:
> I screwed up a rebase somehow.
>
> v2: Drop bogus hunk.
>
> 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 | 33
> +++++++++++++++++++++++++++
> 2 files changed, 35 insertions(+), 2 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 c6d2eff0e19e..95746f5b0b9e 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -379,6 +379,39 @@ struct intel_hdcp_shim {
> /* Detects panel's hdcp capability. This is optional for HDMI.
> */
> int (*hdcp_capable)(struct intel_digital_port *intel_dig_port,
> bool *hdcp_capable);
> +<<<<<<< HEAD
> +=======
Conflict markers.
I guess this still isn't what you wanted to send?
> +
> + /* HDCP adaptation(DP/HDMI) required on the port */
> + enum hdcp_wired_protocol protocol;
> +
> + /* Detects whether Panel is HDCP2.2 capable */
> + int (*hdcp_2_2_capable)(struct intel_digital_port
> *intel_dig_port,
> + bool *capable);
> +
> + /* 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.
> + * 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);
> +
> + /*
> + * Implementation of DP HDCP2.2 Errata for the communication of
> stream
> + * type to Receivers. In DP HDCP2.2 Stream type is one of the
> input to
> + * the HDCP2.2 Cipher for En/De-Cryption. Not applicable for
> HDMI.
> + */
> + int (*config_stream_type)(struct intel_digital_port
> *intel_dig_port,
> + void *buf, size_t size);
> +
> + /* HDCP2.2 Link Integrity Check */
> + int (*check_2_2_link)(struct intel_digital_port
> *intel_dig_port);
> +>>>>>>> 4f9e07e71945... drm/doc: Move bridge link target to the
> right place
> };
>
> struct intel_hdcp {
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
