From: Ramalingam C Date: Wed, 5 Dec 2018 11:44:41 +0000 (+0530) Subject: drm/i915: Fix platform coverage for HDCP1.4 X-Git-Tag: v5.1-rc1~117^2~22^2~103 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0ea697a66497d68acbffb84d7bdaf2c92a89fe1;p=thirdparty%2Fkernel%2Flinux.git drm/i915: Fix platform coverage for HDCP1.4 HDCP1.4 is enabled and validated only on GEN9+ platforms. v2: Removed the unnecessary parens [Ville] Signed-off-by: Ramalingam C Reviewed-by: Sean Paul Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/1544010283-20223-3-git-send-email-ramalingam.c@intel.com --- diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index c16bffcce3b02..1e5a1e07e3431 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -769,8 +769,7 @@ static void intel_hdcp_prop_work(struct work_struct *work) bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port) { /* PORT E doesn't have HDCP, and PORT F is disabled */ - return ((INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) && - !IS_CHERRYVIEW(dev_priv) && port < PORT_E); + return INTEL_GEN(dev_priv) >= 9 && port < PORT_E; } int intel_hdcp_init(struct intel_connector *connector,