[v2,2/4] drm/i915: HDCP support on above PORT_E
diff mbox series

Message ID 20200129132619.4727-1-anshuman.gupta@intel.com
State New
Headers show
Series
  • Untitled series #234515
Related show

Commit Message

Anshuman Gupta Jan. 29, 2020, 1:26 p.m. UTC
As Gen12 onwards there are HDCP instances for each transcoder
instead of port, remove the (port < PORT_E) hdcp support
limitation for platform >= Gen12.

v2:
 - Nuke the comment and cosmetic changes. [Jani]

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Ramalingam C Feb. 7, 2020, 2:03 p.m. UTC | #1
On 2020-01-29 at 18:56:19 +0530, Anshuman Gupta wrote:
> As Gen12 onwards there are HDCP instances for each transcoder
> instead of port, remove the (port < PORT_E) hdcp support
> limitation for platform >= Gen12.
> 
> v2:
>  - Nuke the comment and cosmetic changes. [Jani]
> 
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Ramalingam C <ramalingam.c@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index be083136eee2..231b9c12c0b6 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -921,8 +921,8 @@ 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_INFO(dev_priv)->display.has_hdcp && port < PORT_E;
> +	return INTEL_INFO(dev_priv)->display.has_hdcp &&
> +			(INTEL_GEN(dev_priv) >= 12 || port < PORT_E);
As we discussed offline, this <PORT_E check for even <gen12 doesn't make
sense as per Bspec. I would suggest we test HDCP1.4 and 2.2 on existing
setup of <gen12 too.

Or as we could remove this limitation and address the failure cases(not
expected any as per HW spec).

For >=gen12 transcoder based hdcp instances, this check dont make any sense.

Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
>  }
>  
>  static int
> -- 
> 2.24.0
>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index be083136eee2..231b9c12c0b6 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -921,8 +921,8 @@  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_INFO(dev_priv)->display.has_hdcp && port < PORT_E;
+	return INTEL_INFO(dev_priv)->display.has_hdcp &&
+			(INTEL_GEN(dev_priv) >= 12 || port < PORT_E);
 }
 
 static int