diff mbox

[v5] drm: Fix HDCP downstream dev count read

Message ID 1522929802-22850-1-git-send-email-ramalingam.c@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ramalingam C April 5, 2018, 12:03 p.m. UTC
In both HDMI and DP, device count is represented by 6:0 bits of a
register(BInfo/Bstatus)

So macro for bitmasking the device_count is fixed(0x3F->0x7F).

v3:
  Retained the Rb-ed.
v4:
  %s/drm\/i915/drm [rodrigo]
v5:
  Added "Fixes:" and HDCP keyword in subject [Rodrigo, Sean Paul]

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Fixes: 495eb7f877ab drm: Add some HDCP related #defines
cc: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
---
 include/drm/drm_hdcp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Sean Paul April 16, 2018, 4:11 p.m. UTC | #1
On Thu, Apr 5, 2018 at 8:09 AM Ramalingam C <ramalingam.c@intel.com> wrote:

> In both HDMI and DP, device count is represented by 6:0 bits of a
> register(BInfo/Bstatus)

> So macro for bitmasking the device_count is fixed(0x3F->0x7F).

> v3:
>    Retained the Rb-ed.
> v4:
>    %s/drm\/i915/drm [rodrigo]
> v5:
>    Added "Fixes:" and HDCP keyword in subject [Rodrigo, Sean Paul]

> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>


Thank you for your patch, I've pushed it to -misc-fixes

Sean


> Fixes: 495eb7f877ab drm: Add some HDCP related #defines
> cc: Sean Paul <seanpaul@chromium.org>
> Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
>   include/drm/drm_hdcp.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

> diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
> index 562fa7df2637..98e63d870139 100644
> --- a/include/drm/drm_hdcp.h
> +++ b/include/drm/drm_hdcp.h
> @@ -19,7 +19,7 @@
>   #define DRM_HDCP_RI_LEN                                2
>   #define DRM_HDCP_V_PRIME_PART_LEN              4
>   #define DRM_HDCP_V_PRIME_NUM_PARTS             5
> -#define DRM_HDCP_NUM_DOWNSTREAM(x)             (x & 0x3f)
> +#define DRM_HDCP_NUM_DOWNSTREAM(x)             (x & 0x7f)
>   #define DRM_HDCP_MAX_CASCADE_EXCEEDED(x)       (x & BIT(3))
>   #define DRM_HDCP_MAX_DEVICE_EXCEEDED(x)                (x & BIT(7))

> --
> 2.7.4
diff mbox

Patch

diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
index 562fa7df2637..98e63d870139 100644
--- a/include/drm/drm_hdcp.h
+++ b/include/drm/drm_hdcp.h
@@ -19,7 +19,7 @@ 
 #define DRM_HDCP_RI_LEN				2
 #define DRM_HDCP_V_PRIME_PART_LEN		4
 #define DRM_HDCP_V_PRIME_NUM_PARTS		5
-#define DRM_HDCP_NUM_DOWNSTREAM(x)		(x & 0x3f)
+#define DRM_HDCP_NUM_DOWNSTREAM(x)		(x & 0x7f)
 #define DRM_HDCP_MAX_CASCADE_EXCEEDED(x)	(x & BIT(3))
 #define DRM_HDCP_MAX_DEVICE_EXCEEDED(x)		(x & BIT(7))