| Message ID | 20201210062640.11783-10-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 |
On 2020-12-10 at 11:56:31 +0530, Anshuman Gupta wrote: > Enable HDCP 1.4 over DP MST for Gen12. > > v2: > - Enable HDCP for <= Gen12 platforms. [Ram] > > Cc: Ramalingam C <ramalingam.c@intel.com> > Tested-by: Karthik B S <karthik.b.s@intel.com> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 47beb442094f..ae24e1af49be 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -829,12 +829,10 @@ 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) { > + 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"); > + drm_dbg_kms(&dev_priv->drm, "HDCP init failed, skipping.\n"); "HDCP MST init failed" might be more meaningful with connector name and ID. With that addressed Reviewed-by: Ramalingam C <ramalingam.c@intel.com> > } > > /* > -- > 2.26.2 >
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 47beb442094f..ae24e1af49be 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -829,12 +829,10 @@ 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) { + 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"); + drm_dbg_kms(&dev_priv->drm, "HDCP init failed, skipping.\n"); } /*