aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorRamalingam C <ramalingam.c@intel.com>2018-04-05 17:33:22 +0530
committerSean Paul <seanpaul@chromium.org>2018-04-16 12:10:48 -0400
commitb8e47d87be65aec931846ced9a34a22d2021c311 (patch)
tree378f21e4957b241b4ba86c4800c2c098e7bce68a /include/drm
parentMerge airlied/drm-next into drm-misc-fixes (diff)
downloadlinux-dev-b8e47d87be65aec931846ced9a34a22d2021c311.tar.xz
linux-dev-b8e47d87be65aec931846ced9a34a22d2021c311.zip
drm: Fix HDCP downstream dev count read
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> Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/1522929802-22850-1-git-send-email-ramalingam.c@intel.com
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_hdcp.h2
1 files changed, 1 insertions, 1 deletions
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))