| Message ID | 1522763873-23041-40-git-send-email-ramalingam.c@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>-----Original Message----- >From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of >Ramalingam C >Sent: Tuesday, April 3, 2018 7:28 PM >To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; >seanpaul@chromium.org; daniel@ffwll.ch; chris@chris-wilson.co.uk; >jani.nikula@linux.intel.com; Winkler, Tomas <tomas.winkler@intel.com>; >Usyskin, Alexander <alexander.usyskin@intel.com> >Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com> >Subject: [Intel-gfx] [PATCH v3 39/40] drm/i915: Add HDCP2.2 support for DP >connectors > >On DP connector init, intel_hdcp_init is passed with a flag for hdcp2.2 support >based on the platform capability. Looks ok to me. For me, hdcp2.2 capability should be added in dev_info. With that fixed. Reviewed-by: Uma Shankar <uma.shankar@intel.com> > >v2: > Rebased. >v3: > No Changes. > >Signed-off-by: Ramalingam C <ramalingam.c@intel.com> >--- > drivers/gpu/drm/i915/intel_dp.c | 2 +- > drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdcp.c | 1 - > 3 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >index e5cb54ceda38..43318003ce14 100644 >--- a/drivers/gpu/drm/i915/intel_dp.c >+++ b/drivers/gpu/drm/i915/intel_dp.c >@@ -6733,7 +6733,7 @@ intel_dp_init_connector(struct intel_digital_port >*intel_dig_port, > > if (is_hdcp_supported(dev_priv, port) && !intel_dp_is_edp(intel_dp)) { > int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim, >- false); >+ is_hdcp2_supported(dev_priv)); > if (ret) > DRM_DEBUG_KMS("HDCP init failed, skipping.\n"); > } >diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h >index 37f9a0e2ea13..2bb562738964 100644 >--- a/drivers/gpu/drm/i915/intel_drv.h >+++ b/drivers/gpu/drm/i915/intel_drv.h >@@ -1941,6 +1941,7 @@ int intel_hdcp_enable(struct intel_connector >*connector); int intel_hdcp_disable(struct intel_connector *connector); bool >is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port); void >intel_hdcp_handle_cp_irq(struct intel_connector *connector); >+bool is_hdcp2_supported(struct drm_i915_private *dev_priv); > > /* intel_psr.c */ > #define CAN_PSR(dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support) >diff --git a/drivers/gpu/drm/i915/intel_hdcp.c >b/drivers/gpu/drm/i915/intel_hdcp.c >index 9386b451191e..9d5cade3b236 100644 >--- a/drivers/gpu/drm/i915/intel_hdcp.c >+++ b/drivers/gpu/drm/i915/intel_hdcp.c >@@ -1723,7 +1723,6 @@ static int mei_cldev_notify(struct notifier_block *nb, >unsigned long event, > return NOTIFY_OK; > } > >-static inline > bool is_hdcp2_supported(struct drm_i915_private *dev_priv) { > return (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) || >-- >2.7.4 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Friday 18 May 2018 10:07 PM, Shankar, Uma wrote: > >> -----Original Message----- >> From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of >> Ramalingam C >> Sent: Tuesday, April 3, 2018 7:28 PM >> To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; >> seanpaul@chromium.org; daniel@ffwll.ch; chris@chris-wilson.co.uk; >> jani.nikula@linux.intel.com; Winkler, Tomas <tomas.winkler@intel.com>; >> Usyskin, Alexander <alexander.usyskin@intel.com> >> Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com> >> Subject: [Intel-gfx] [PATCH v3 39/40] drm/i915: Add HDCP2.2 support for DP >> connectors >> >> On DP connector init, intel_hdcp_init is passed with a flag for hdcp2.2 support >> based on the platform capability. > Looks ok to me. For me, hdcp2.2 capability should be added in dev_info. As we discussed, since from gen10 onwards all platforms expected to support hdcp2.2, having the hdcp2.2 support field in dev_info doesn't make much sense. > > With that fixed. > Reviewed-by: Uma Shankar <uma.shankar@intel.com> If you are ok with above explanation I will add your reviewed-by to the patch. Ram > >> v2: >> Rebased. >> v3: >> No Changes. >> >> Signed-off-by: Ramalingam C <ramalingam.c@intel.com> >> --- >> drivers/gpu/drm/i915/intel_dp.c | 2 +- >> drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdcp.c | 1 - >> 3 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index e5cb54ceda38..43318003ce14 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -6733,7 +6733,7 @@ intel_dp_init_connector(struct intel_digital_port >> *intel_dig_port, >> >> if (is_hdcp_supported(dev_priv, port) && !intel_dp_is_edp(intel_dp)) { >> int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim, >> - false); >> + is_hdcp2_supported(dev_priv)); >> if (ret) >> DRM_DEBUG_KMS("HDCP init failed, skipping.\n"); >> } >> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h >> index 37f9a0e2ea13..2bb562738964 100644 >> --- a/drivers/gpu/drm/i915/intel_drv.h >> +++ b/drivers/gpu/drm/i915/intel_drv.h >> @@ -1941,6 +1941,7 @@ int intel_hdcp_enable(struct intel_connector >> *connector); int intel_hdcp_disable(struct intel_connector *connector); bool >> is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port); void >> intel_hdcp_handle_cp_irq(struct intel_connector *connector); >> +bool is_hdcp2_supported(struct drm_i915_private *dev_priv); >> >> /* intel_psr.c */ >> #define CAN_PSR(dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support) >> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c >> b/drivers/gpu/drm/i915/intel_hdcp.c >> index 9386b451191e..9d5cade3b236 100644 >> --- a/drivers/gpu/drm/i915/intel_hdcp.c >> +++ b/drivers/gpu/drm/i915/intel_hdcp.c >> @@ -1723,7 +1723,6 @@ static int mei_cldev_notify(struct notifier_block *nb, >> unsigned long event, >> return NOTIFY_OK; >> } >> >> -static inline >> bool is_hdcp2_supported(struct drm_i915_private *dev_priv) { >> return (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) || >> -- >> 2.7.4 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index e5cb54ceda38..43318003ce14 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -6733,7 +6733,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, if (is_hdcp_supported(dev_priv, port) && !intel_dp_is_edp(intel_dp)) { int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim, - false); + is_hdcp2_supported(dev_priv)); if (ret) DRM_DEBUG_KMS("HDCP init failed, skipping.\n"); } diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 37f9a0e2ea13..2bb562738964 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1941,6 +1941,7 @@ int intel_hdcp_enable(struct intel_connector *connector); int intel_hdcp_disable(struct intel_connector *connector); bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port); void intel_hdcp_handle_cp_irq(struct intel_connector *connector); +bool is_hdcp2_supported(struct drm_i915_private *dev_priv); /* intel_psr.c */ #define CAN_PSR(dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support) diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index 9386b451191e..9d5cade3b236 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -1723,7 +1723,6 @@ static int mei_cldev_notify(struct notifier_block *nb, unsigned long event, return NOTIFY_OK; } -static inline bool is_hdcp2_supported(struct drm_i915_private *dev_priv) { return (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) ||
On DP connector init, intel_hdcp_init is passed with a flag for hdcp2.2 support based on the platform capability. v2: Rebased. v3: No Changes. Signed-off-by: Ramalingam C <ramalingam.c@intel.com> --- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdcp.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-)