diff mbox series

[v5,08/17] drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support

Message ID 20201111062051.11529-9-anshuman.gupta@intel.com (mailing list archive)
State New, archived
Headers show
Series HDCP 2.2 and HDCP 1.4 Gen12 DP MST support | expand

Commit Message

Gupta, Anshuman Nov. 11, 2020, 6:20 a.m. UTC
Enable HDCP 1.4 over DP MST for Gen12.

Cc: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Ramalingam C Nov. 24, 2020, 2:20 p.m. UTC | #1
On 2020-11-11 at 11:50:42 +0530, Anshuman Gupta wrote:
> Enable HDCP 1.4 over DP MST for Gen12.
> 
> Cc: Ramalingam C <ramalingam.c@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 16865b200062..f00e12fc83e8 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -826,13 +826,9 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
>  	intel_attach_force_audio_property(connector);
>  	intel_attach_broadcast_rgb_property(connector);
>  
> -
> -	/* TODO: Figure out how to make HDCP work on GEN12+ */
> -	if (INTEL_GEN(dev_priv) < 12) {
Just a thought, shouldn't we enable for the platforms that we have
tested HDCP? like <= 12. 

We could keep expanding the list supported.

Ram.
> -		ret = intel_dp_init_hdcp(dig_port, intel_connector);
> -		if (ret)
> -			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
> -	}
> +	ret = intel_dp_init_hdcp(dig_port, intel_connector);
> +	if (ret)
> +		drm_dbg_kms(&dev_priv->drm, "HDCP init failed, skipping.\n");
>  
>  	/*
>  	 * Reuse the prop from the SST connector because we're
> -- 
> 2.26.2
>
Gupta, Anshuman Nov. 24, 2020, 3:02 p.m. UTC | #2
On 2020-11-24 at 19:50:17 +0530, Ramalingam C wrote:
> On 2020-11-11 at 11:50:42 +0530, Anshuman Gupta wrote:
> > Enable HDCP 1.4 over DP MST for Gen12.
> > 
> > Cc: Ramalingam C <ramalingam.c@intel.com>
> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++-------
> >  1 file changed, 3 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > index 16865b200062..f00e12fc83e8 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > @@ -826,13 +826,9 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
> >  	intel_attach_force_audio_property(connector);
> >  	intel_attach_broadcast_rgb_property(connector);
> >  
> > -
> > -	/* TODO: Figure out how to make HDCP work on GEN12+ */
> > -	if (INTEL_GEN(dev_priv) < 12) {
> Just a thought, shouldn't we enable for the platforms that we have
> tested HDCP? like <= 12. 
> 
> We could keep expanding the list supported.
thanks for comment, i will keep this as if (INTEL_GEN(dev_priv) < 12)
Thanks,
Anshuman
> 
> Ram.
> > -		ret = intel_dp_init_hdcp(dig_port, intel_connector);
> > -		if (ret)
> > -			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
> > -	}
> > +	ret = intel_dp_init_hdcp(dig_port, intel_connector);
> > +	if (ret)
> > +		drm_dbg_kms(&dev_priv->drm, "HDCP init failed, skipping.\n");
> >  
> >  	/*
> >  	 * Reuse the prop from the SST connector because we're
> > -- 
> > 2.26.2
> >
Gupta, Anshuman Nov. 24, 2020, 4:05 p.m. UTC | #3
On 2020-11-24 at 21:47:19 +0530, Ramalingam C wrote:
> On 2020-11-24 at 20:32:43 +0530, Anshuman Gupta wrote:
> > On 2020-11-24 at 19:50:17 +0530, Ramalingam C wrote:
> > > On 2020-11-11 at 11:50:42 +0530, Anshuman Gupta wrote:
> > > > Enable HDCP 1.4 over DP MST for Gen12.
> > > > 
> > > > Cc: Ramalingam C <ramalingam.c@intel.com>
> > > > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> > > > ---
> > > >  drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++-------
> > > >  1 file changed, 3 insertions(+), 7 deletions(-)
> > > > 
> > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > > index 16865b200062..f00e12fc83e8 100644
> > > > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > > @@ -826,13 +826,9 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
> > > >  	intel_attach_force_audio_property(connector);
> > > >  	intel_attach_broadcast_rgb_property(connector);
> > > >  
> > > > -
> > > > -	/* TODO: Figure out how to make HDCP work on GEN12+ */
> > > > -	if (INTEL_GEN(dev_priv) < 12) {
> > > Just a thought, shouldn't we enable for the platforms that we have
> > > tested HDCP? like <= 12. 
> > > 
> > > We could keep expanding the list supported.
> > thanks for comment, i will keep this as if (INTEL_GEN(dev_priv) < 12)
> I guess you meant <= 12.
:) yes it was typo
Thanks,
Anshuman.
> 
> Ram.
> > Thanks,
> > Anshuman
> > > 
> > > Ram.
> > > > -		ret = intel_dp_init_hdcp(dig_port, intel_connector);
> > > > -		if (ret)
> > > > -			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
> > > > -	}
> > > > +	ret = intel_dp_init_hdcp(dig_port, intel_connector);
> > > > +	if (ret)
> > > > +		drm_dbg_kms(&dev_priv->drm, "HDCP init failed, skipping.\n");
> > > >  
> > > >  	/*
> > > >  	 * Reuse the prop from the SST connector because we're
> > > > -- 
> > > > 2.26.2
> > > >
Ramalingam C Nov. 24, 2020, 4:17 p.m. UTC | #4
On 2020-11-24 at 20:32:43 +0530, Anshuman Gupta wrote:
> On 2020-11-24 at 19:50:17 +0530, Ramalingam C wrote:
> > On 2020-11-11 at 11:50:42 +0530, Anshuman Gupta wrote:
> > > Enable HDCP 1.4 over DP MST for Gen12.
> > > 
> > > Cc: Ramalingam C <ramalingam.c@intel.com>
> > > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++-------
> > >  1 file changed, 3 insertions(+), 7 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > index 16865b200062..f00e12fc83e8 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > @@ -826,13 +826,9 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
> > >  	intel_attach_force_audio_property(connector);
> > >  	intel_attach_broadcast_rgb_property(connector);
> > >  
> > > -
> > > -	/* TODO: Figure out how to make HDCP work on GEN12+ */
> > > -	if (INTEL_GEN(dev_priv) < 12) {
> > Just a thought, shouldn't we enable for the platforms that we have
> > tested HDCP? like <= 12. 
> > 
> > We could keep expanding the list supported.
> thanks for comment, i will keep this as if (INTEL_GEN(dev_priv) < 12)
I guess you meant <= 12.

Ram.
> Thanks,
> Anshuman
> > 
> > Ram.
> > > -		ret = intel_dp_init_hdcp(dig_port, intel_connector);
> > > -		if (ret)
> > > -			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
> > > -	}
> > > +	ret = intel_dp_init_hdcp(dig_port, intel_connector);
> > > +	if (ret)
> > > +		drm_dbg_kms(&dev_priv->drm, "HDCP init failed, skipping.\n");
> > >  
> > >  	/*
> > >  	 * Reuse the prop from the SST connector because we're
> > > -- 
> > > 2.26.2
> > >
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 16865b200062..f00e12fc83e8 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -826,13 +826,9 @@  static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 
-
-	/* TODO: Figure out how to make HDCP work on GEN12+ */
-	if (INTEL_GEN(dev_priv) < 12) {
-		ret = intel_dp_init_hdcp(dig_port, intel_connector);
-		if (ret)
-			DRM_DEBUG_KMS("HDCP init failed, skipping.\n");
-	}
+	ret = intel_dp_init_hdcp(dig_port, intel_connector);
+	if (ret)
+		drm_dbg_kms(&dev_priv->drm, "HDCP init failed, skipping.\n");
 
 	/*
 	 * Reuse the prop from the SST connector because we're