Message ID | 1543946827-31662-3-git-send-email-ramalingam.c@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | HDCP1.4 Fixes - II | expand |
On Tue, Dec 04, 2018 at 11:37:05PM +0530, Ramalingam C wrote: > HDCP1.4 is enabled and validated only on GEN9+ platforms. > > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > Reviewed-by: Sean Paul <sean@poorly.run> > --- > drivers/gpu/drm/i915/intel_hdcp.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c > index c16bffcce3b0..bccfb001340a 100644 > --- a/drivers/gpu/drm/i915/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/intel_hdcp.c > @@ -769,8 +769,7 @@ 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_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) && > - !IS_CHERRYVIEW(dev_priv) && port < PORT_E); > + return ((INTEL_GEN(dev_priv) >= 9) && port < PORT_E); Drive-by: Lots of pointless parens floating around here. > } > > int intel_hdcp_init(struct intel_connector *connector, > -- > 2.7.4
On 12/5/2018 12:45 AM, Ville Syrjälä wrote: > On Tue, Dec 04, 2018 at 11:37:05PM +0530, Ramalingam C wrote: >> HDCP1.4 is enabled and validated only on GEN9+ platforms. >> >> Signed-off-by: Ramalingam C <ramalingam.c@intel.com> >> Reviewed-by: Sean Paul <sean@poorly.run> >> --- >> drivers/gpu/drm/i915/intel_hdcp.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c >> index c16bffcce3b0..bccfb001340a 100644 >> --- a/drivers/gpu/drm/i915/intel_hdcp.c >> +++ b/drivers/gpu/drm/i915/intel_hdcp.c >> @@ -769,8 +769,7 @@ 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_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) && >> - !IS_CHERRYVIEW(dev_priv) && port < PORT_E); >> + return ((INTEL_GEN(dev_priv) >= 9) && port < PORT_E); > Drive-by: Lots of pointless parens floating around here. kept it for readability. Perhaps overkill here. Removed them. Thanks, --Ram > >> } >> >> int intel_hdcp_init(struct intel_connector *connector, >> -- >> 2.7.4 <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body text="#000000" bgcolor="#FFFFFF"> <p><br> </p> <div class="moz-cite-prefix">On 12/5/2018 12:45 AM, Ville Syrjälä wrote:<br> </div> <blockquote type="cite" cite="mid:20181204191502.GN9144@intel.com"> <pre class="moz-quote-pre" wrap="">On Tue, Dec 04, 2018 at 11:37:05PM +0530, Ramalingam C wrote: </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap="">HDCP1.4 is enabled and validated only on GEN9+ platforms. Signed-off-by: Ramalingam C <a class="moz-txt-link-rfc2396E" href="mailto:ramalingam.c@intel.com"><ramalingam.c@intel.com></a> Reviewed-by: Sean Paul <a class="moz-txt-link-rfc2396E" href="mailto:sean@poorly.run"><sean@poorly.run></a> --- drivers/gpu/drm/i915/intel_hdcp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index c16bffcce3b0..bccfb001340a 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -769,8 +769,7 @@ 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_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) && - !IS_CHERRYVIEW(dev_priv) && port < PORT_E); + return ((INTEL_GEN(dev_priv) >= 9) && port < PORT_E); </pre> </blockquote> <pre class="moz-quote-pre" wrap=""> Drive-by: Lots of pointless parens floating around here.</pre> </blockquote> <pre>kept it for readability. Perhaps overkill here. Removed them. Thanks, --Ram </pre> <blockquote type="cite" cite="mid:20181204191502.GN9144@intel.com"> <pre class="moz-quote-pre" wrap=""> </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap=""> } int intel_hdcp_init(struct intel_connector *connector,
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index c16bffcce3b0..bccfb001340a 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -769,8 +769,7 @@ 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_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) && - !IS_CHERRYVIEW(dev_priv) && port < PORT_E); + return ((INTEL_GEN(dev_priv) >= 9) && port < PORT_E); } int intel_hdcp_init(struct intel_connector *connector,