drm/i915/hdcp: Use both bits for device_count

Smatch spotted:
drivers/gpu/drm/i915//intel_hdcp.c:1406 hdcp2_authenticate_repeater_topology() warn: should this be a bitwise op?

and indeed looks to be suspect that we do need to use a bitwise or to
combine the two register fields into one counter.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ramalingam C <ramalingam.c@intel.com>
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190517102225.3069-3-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index 53df2f2376e840ef588c698f7139b8a950ec1aac..bc3a94d491c4d0992b24346d011840318ade13d2 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -1402,8 +1402,8 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
                return -EINVAL;
        }
 
-       device_cnt = HDCP_2_2_DEV_COUNT_HI(rx_info[0]) << 4 ||
-                       HDCP_2_2_DEV_COUNT_LO(rx_info[1]);
+       device_cnt = (HDCP_2_2_DEV_COUNT_HI(rx_info[0]) << 4 |
+                     HDCP_2_2_DEV_COUNT_LO(rx_info[1]));
        if (drm_hdcp_check_ksvs_revoked(dev, msgs.recvid_list.receiver_ids,
                                        device_cnt)) {
                DRM_ERROR("Revoked receiver ID(s) is in list\n");