diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-05-17 11:22:25 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-05-17 14:40:50 +0100 |
| commit | af461ff3fa5e8c68b0a7f241b1d7a3de26caf711 (patch) | |
| tree | 6b88db32305942b3f3111e5a38b046b5dae18c3f /drivers/gpu/drm/i915/intel_hdcp.c | |
| parent | 96ac08137e1a3604a6a62a71462c914d5b624c6d (diff) | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdcp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index 53df2f2376e8..bc3a94d491c4 100644 --- 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"); |