| Message ID | 20200128135425.14596-3-anshuman.gupta@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | HDCP Misc series | expand |
On Tue, 28 Jan 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote: > As Gen12 onwards there are HDCP instances for each transcoder > instead of port, remove the (port >=PORT_E) hdcp support > limitation. > > CC: Ramalingam C <ramalingam.c@intel.com> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index be083136eee2..d3a1dd791ff9 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -922,7 +922,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); Superfluous braces around (INTEL_GEN(dev_priv) >= 12). BR, Jani. > } > > static int
On Tue, 28 Jan 2020, Jani Nikula <jani.nikula@linux.intel.com> wrote: > On Tue, 28 Jan 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote: >> As Gen12 onwards there are HDCP instances for each transcoder >> instead of port, remove the (port >=PORT_E) hdcp support >> limitation. >> >> CC: Ramalingam C <ramalingam.c@intel.com> >> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> >> --- >> drivers/gpu/drm/i915/display/intel_hdcp.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c >> index be083136eee2..d3a1dd791ff9 100644 >> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c >> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c >> @@ -922,7 +922,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 */ PS. It's probably best to nuke the comment. >> - 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); > > Superfluous braces around (INTEL_GEN(dev_priv) >= 12). > > BR, > Jani. > >> } >> >> static int
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index be083136eee2..d3a1dd791ff9 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -922,7 +922,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
As Gen12 onwards there are HDCP instances for each transcoder instead of port, remove the (port >=PORT_E) hdcp support limitation. CC: Ramalingam C <ramalingam.c@intel.com> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> --- drivers/gpu/drm/i915/display/intel_hdcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)