diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-01-10 07:50:19 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-01-10 07:50:21 +0300 |
| commit | 7ac9f3366fb83aa4a1b25f6e84ad96c06549e95f (patch) | |
| tree | b19d5354ad2a65ec6b84c111a3a5183b4e81be2e | |
| parent | 9d89551994a430b50c4fffcb1e617a057fa76e20 (diff) | |
| parent | 77bf21a03a2ad45cf66f73f13154b1669d9cf52a (diff) | |
| download | linux-7ac9f3366fb83aa4a1b25f6e84ad96c06549e95f.tar.xz | |
Merge tag 'drm-intel-fixes-2025-01-08' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
- Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link" [hdcp] (Suraj Kandpal)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z37BPchEzY0ovIqF@linux
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hdcp.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index f57e4dba2873..8fee26d791f4 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -1158,9 +1158,15 @@ static int intel_hdcp_check_link(struct intel_connector *connector) goto out; } - intel_hdcp_update_value(connector, - DRM_MODE_CONTENT_PROTECTION_DESIRED, - true); + ret = intel_hdcp1_enable(connector); + if (ret) { + drm_err(display->drm, "Failed to enable hdcp (%d)\n", ret); + intel_hdcp_update_value(connector, + DRM_MODE_CONTENT_PROTECTION_DESIRED, + true); + goto out; + } + out: mutex_unlock(&dig_port->hdcp_mutex); mutex_unlock(&hdcp->mutex); |