Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92622ed5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: fix check for sink support for HDCP 2.x"

parents 2d432c94 a74be3b1

drivers/gpu/drm/msm/dp/dp_hdcp2p2.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define DP_INTR_STATUS3				(0x00000028)

#define DP_INTR_STATUS3				(0x00000028)

#define dp_read(offset) readl_relaxed((offset))

#define dp_read(offset) readl_relaxed((offset))

#define dp_write(offset, data) writel_relaxed((data), (offset))

#define dp_write(offset, data) writel_relaxed((data), (offset))

#define DP_HDCP_RXCAPS_LENGTH 3





enum dp_hdcp2p2_sink_status {

enum dp_hdcp2p2_sink_status {

	SINK_DISCONNECTED,

	SINK_DISCONNECTED,
@@ -893,21 +894,22 @@ void *sde_dp_hdcp2p2_init(struct sde_hdcp_init_data *init_data) 
static bool dp_hdcp2p2_supported(struct dp_hdcp2p2_ctrl *ctrl)

static bool dp_hdcp2p2_supported(struct dp_hdcp2p2_ctrl *ctrl)

{

{

	u32 const rxcaps_dpcd_offset = 0x6921d;

	u32 const rxcaps_dpcd_offset = 0x6921d;

	ssize_t const bytes_to_read = 1;

	ssize_t bytes_read = 0;

	ssize_t bytes_read = 0;

	u8 buf = 0;

	u8 buf[DP_HDCP_RXCAPS_LENGTH];





	bytes_read = drm_dp_dpcd_read(ctrl->init_data.drm_aux,

	bytes_read = drm_dp_dpcd_read(ctrl->init_data.drm_aux,

			rxcaps_dpcd_offset, &buf, bytes_to_read);

			rxcaps_dpcd_offset, &buf, DP_HDCP_RXCAPS_LENGTH);

	if (bytes_read != bytes_to_read) {

	if (bytes_read != DP_HDCP_RXCAPS_LENGTH) {

		pr_err("RxCaps read failed\n");

		pr_err("RxCaps read failed\n");

		goto error;

		goto error;

	}

	}





	pr_debug("rxcaps 0x%x\n", buf);

	pr_debug("HDCP_CAPABLE=%lu\n", (buf[2] & BIT(1)) >> 1);

	pr_debug("VERSION=%d\n", buf[0]);





	if (buf & BIT(1))

	if ((buf[2] & BIT(1)) && (buf[0] == 0x2))

		return true;

		return true;



error:

error:

	return false;

	return false;

}

}