diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2018-01-18 16:10:25 +0000 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-01-18 11:57:13 -0500 |
| commit | b7fc1a9b7e62dcae40d51e83390cbb678ae5c6c2 (patch) | |
| tree | 804219c81e8ab22f29c80bcb8c86775435e99517 /drivers/gpu/drm/i915 | |
| parent | 01468d6c711a31a9fe333d072afa8a4730ef3bf9 (diff) | |
| download | linux-stable-b7fc1a9b7e62dcae40d51e83390cbb678ae5c6c2.tar.gz linux-stable-b7fc1a9b7e62dcae40d51e83390cbb678ae5c6c2.tar.bz2 linux-stable-b7fc1a9b7e62dcae40d51e83390cbb678ae5c6c2.zip | |
drm/i915/dp: Fix compilation of intel_dp_hdcp_check_link
drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_hdcp_check_link’:
drivers/gpu/drm/i915/intel_dp.c:5191:26: error: ?: using integer constants in boolean context [-Werror=int-in-bool-context]
return ret >= 0 ? -EIO : ret;
Fixes: 20f24d776d1b ("drm/i915: Implement HDCP for DisplayPort")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ramalingam C <ramalingam.c@intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180118161025.22700-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 68229f53d5b8..0f2290c7bede 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -5184,12 +5184,14 @@ bool intel_dp_hdcp_check_link(struct intel_digital_port *intel_dig_port) { ssize_t ret; u8 bstatus; + ret = drm_dp_dpcd_read(&intel_dig_port->dp.aux, DP_AUX_HDCP_BSTATUS, &bstatus, 1); if (ret != 1) { DRM_ERROR("Read bstatus from DP/AUX failed (%zd)\n", ret); - return ret >= 0 ? -EIO : ret; + return false; } + return !(bstatus & (DP_BSTATUS_LINK_FAILURE | DP_BSTATUS_REAUTH_REQ)); } |