| Message ID | 1548917996-28081-21-git-send-email-ramalingam.c@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Implement HDCP2.2 | expand |
> > On HDMI connector init, intel_hdcp_init is passed with a flag for hdcp2.2 > support based on the platform capability. > > v2: > Rebased. > v3: > Collected the reviewed-by received. > > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > Reviewed-by: Uma Shankar <uma.shankar@intel.com> > --- > drivers/gpu/drm/i915/intel_hdmi.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c > b/drivers/gpu/drm/i915/intel_hdmi.c > index 3b4fe7048af9..2c4bf6d0c39f 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -2621,7 +2621,8 @@ void intel_hdmi_init_connector(struct > intel_digital_port *intel_dig_port, > > if (is_hdcp_supported(dev_priv, port)) { > int ret = intel_hdcp_init(intel_connector, > - &intel_hdmi_hdcp_shim, false); > + &intel_hdmi_hdcp_shim, > + is_hdcp2_supported(dev_priv)); intel_hdcp_init is always called with is_hdcp2_supported() both for DP and HDMI, so you can just remove the argument it's redundant. if (is_hdcp2_supported()) intel_hdcp2_init(connector); They are both defied in intel_hdcp.c. Thanks Tomas
On 2/4/2019 9:34 PM, Winkler, Tomas wrote: >> On HDMI connector init, intel_hdcp_init is passed with a flag for hdcp2.2 >> support based on the platform capability. >> >> v2: >> Rebased. >> v3: >> Collected the reviewed-by received. >> >> Signed-off-by: Ramalingam C <ramalingam.c@intel.com> >> Reviewed-by: Uma Shankar <uma.shankar@intel.com> >> --- >> drivers/gpu/drm/i915/intel_hdmi.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c >> b/drivers/gpu/drm/i915/intel_hdmi.c >> index 3b4fe7048af9..2c4bf6d0c39f 100644 >> --- a/drivers/gpu/drm/i915/intel_hdmi.c >> +++ b/drivers/gpu/drm/i915/intel_hdmi.c >> @@ -2621,7 +2621,8 @@ void intel_hdmi_init_connector(struct >> intel_digital_port *intel_dig_port, >> >> if (is_hdcp_supported(dev_priv, port)) { >> int ret = intel_hdcp_init(intel_connector, >> - &intel_hdmi_hdcp_shim, false); >> + &intel_hdmi_hdcp_shim, >> + is_hdcp2_supported(dev_priv)); > intel_hdcp_init is always called with is_hdcp2_supported() both for DP and HDMI, so you can just remove the argument it's redundant. Thanks for the review Tomas. Sure. That will reduce a parameter in hdcp_init. --Ram > > if (is_hdcp2_supported()) > intel_hdcp2_init(connector); > > They are both defied in intel_hdcp.c. > > Thanks > Tomas >
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 3b4fe7048af9..2c4bf6d0c39f 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -2621,7 +2621,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, if (is_hdcp_supported(dev_priv, port)) { int ret = intel_hdcp_init(intel_connector, - &intel_hdmi_hdcp_shim, false); + &intel_hdmi_hdcp_shim, + is_hdcp2_supported(dev_priv)); if (ret) DRM_DEBUG_KMS("HDCP init failed, skipping.\n"); }