[v3,2/4] drm/i915: Fix platform coverage for HDCP1.4

Submitted by C, Ramalingam on Dec. 4, 2018, 6:07 p.m.

Details

Message ID 1543946827-31662-3-git-send-email-ramalingam.c@intel.com
State New
Series "HDCP1.4 Fixes - II"
Headers show

Commit Message

C, Ramalingam Dec. 4, 2018, 6:07 p.m.
HDCP1.4 is enabled and validated only on GEN9+ platforms.

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Reviewed-by: Sean Paul <sean@poorly.run>
---
 drivers/gpu/drm/i915/intel_hdcp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index c16bffcce3b0..bccfb001340a 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,

Comments

Ville Syrjälä Dec. 4, 2018, 7:15 p.m.
On Tue, Dec 04, 2018 at 11:37:05PM +0530, Ramalingam C wrote:
> HDCP1.4 is enabled and validated only on GEN9+ platforms.
> 
> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> Reviewed-by: Sean Paul <sean@poorly.run>
> ---
>  drivers/gpu/drm/i915/intel_hdcp.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
> index c16bffcce3b0..bccfb001340a 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);

Drive-by: Lots of pointless parens floating around here.

>  }
>  
>  int intel_hdcp_init(struct intel_connector *connector,
> -- 
> 2.7.4
C, Ramalingam Dec. 5, 2018, 11:53 a.m.
On 12/5/2018 12:45 AM, Ville Syrjälä wrote:
> On Tue, Dec 04, 2018 at 11:37:05PM +0530, Ramalingam C wrote:
>> HDCP1.4 is enabled and validated only on GEN9+ platforms.
>>
>> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
>> Reviewed-by: Sean Paul <sean@poorly.run>
>> ---
>>   drivers/gpu/drm/i915/intel_hdcp.c | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
>> index c16bffcce3b0..bccfb001340a 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);
> Drive-by: Lots of pointless parens floating around here.

kept it for readability. Perhaps overkill here. Removed them.

Thanks,
--Ram

>
>>   }
>>   
>>   int intel_hdcp_init(struct intel_connector *connector,
>> -- 
>> 2.7.4