Commit 1c40428a authored by Bhawanpreet Lakha's avatar Bhawanpreet Lakha Committed by Alex Deucher
Browse files

drm/amd/display: use drm defines for MAX CASCADE MASK 



[Why]
drm already has this define

[How]
drm Mask is 0x08 vs 0x0800. The reason is because drm mask
works on a byte.        ^^
                 =======||
                 ||
Since the first byte is always zero we can ignore it and only check the
second byte.

Signed-off-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 02837a91

drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h

+0 −4
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ 
/* TODO:

 * Replace below defines with these

 *

 * #define DRM_HDCP_MAX_CASCADE_EXCEEDED(x)        (x & BIT(3))

 * #define DRM_HDCP_MAX_CASCADE_EXCEEDED(x)        (x & BIT(3))

 * #define HDCP_2_2_HDMI_RXSTATUS_MSG_SZ_HI(x)     ((x) & 0x3)

 * #define HDCP_2_2_HDMI_RXSTATUS_READY(x)         ((x) & BIT(2))

 * #define HDCP_2_2_HDMI_RXSTATUS_REAUTH_REQ(x)    ((x) & BIT(3))
@@ -46,8 +44,6 @@ 
 * split the HDMI rxstatus into 2bytes before we can use usptream defs

 */



#define BSTATUS_MAX_CASCADE_EXCEEDED_MASK		0x0800

#define BINFO_MAX_CASCADE_EXCEEDED_MASK_DP		0x0800

#define RXSTATUS_MSG_SIZE_MASK				0x03FF

#define RXSTATUS_READY_MASK				0x0400

#define RXSTATUS_REAUTH_REQUEST_MASK			0x0800

drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c

+6 −8
Original line number Diff line number Diff line
@@ -92,15 +92,13 @@ static inline enum mod_hdcp_status check_no_max_cascade(struct mod_hdcp *hdcp) 
	enum mod_hdcp_status status;



	if (is_dp_hdcp(hdcp))

		status = (hdcp->auth.msg.hdcp1.binfo_dp &

				BINFO_MAX_CASCADE_EXCEEDED_MASK_DP) ?

			MOD_HDCP_STATUS_HDCP1_MAX_CASCADE_EXCEEDED_FAILURE :

			MOD_HDCP_STATUS_SUCCESS;

		status = DRM_HDCP_MAX_CASCADE_EXCEEDED(hdcp->auth.msg.hdcp1.binfo_dp >> 8)

				 ? MOD_HDCP_STATUS_HDCP1_MAX_CASCADE_EXCEEDED_FAILURE

				 : MOD_HDCP_STATUS_SUCCESS;

	else

		status = (hdcp->auth.msg.hdcp1.bstatus &

				BSTATUS_MAX_CASCADE_EXCEEDED_MASK) ?

				MOD_HDCP_STATUS_HDCP1_MAX_CASCADE_EXCEEDED_FAILURE :

				MOD_HDCP_STATUS_SUCCESS;

		status = DRM_HDCP_MAX_CASCADE_EXCEEDED(hdcp->auth.msg.hdcp1.bstatus >> 8)

				 ? MOD_HDCP_STATUS_HDCP1_MAX_CASCADE_EXCEEDED_FAILURE

				 : MOD_HDCP_STATUS_SUCCESS;

	return status;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE