When HDCP2.2 enabling fails and HDCP1.4 is supported, HDCP1.4 is
enabled.

v2:
  Rebased.
v3:
  No Changes.
v4:
  Reviewed-by is collected.

Signed-off-by: Ramalingam C <ramalinga...@intel.com>
Reviewed-by: Uma Shankar <uma.shan...@intel.com>
---
 drivers/gpu/drm/i915/intel_hdcp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_hdcp.c 
b/drivers/gpu/drm/i915/intel_hdcp.c
index f53b496073ea..c5a3e0e52853 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -868,7 +868,9 @@ int intel_hdcp_enable(struct intel_connector *connector)
         */
        if (intel_hdcp2_capable(connector))
                ret = _intel_hdcp2_enable(connector);
-       else if (intel_hdcp_capable(connector))
+
+       /* When HDCP2.2 fails, HDCP1.4 will be attempted */
+       if (ret && intel_hdcp_capable(connector))
                ret = _intel_hdcp_enable(connector);
 
        if (!ret) {
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to