-----Original Message----- From: Shankar, Uma <uma.shankar@xxxxxxxxx> Sent: Monday, May 18, 2020 3:45 PM To: Gupta, Anshuman <anshuman.gupta@xxxxxxxxx>; intel-gfx@xxxxxxxxxxxxxxxxxxxxx Subject: RE: [PATCH 1/2] drm/i915/hdcp: Add update_pipe early return > -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of > Anshuman Gupta > Sent: Wednesday, May 13, 2020 5:49 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Subject: [PATCH 1/2] drm/i915/hdcp: Add update_pipe early > return > > Currently intel_hdcp_update_pipe() is also getting called for non-hdcp > connectors and got though its conditional code flow, which is > completely unnecessary for non-hdcp connectors, therefore it make > sense to have an early return. No functional change. Looks Good to me. Reviewed-by: Uma Shankar <uma.shankar@xxxxxxxxx> Thanks Uma for review! > Signed-off-by: Anshuman Gupta <anshuman.gupta@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c > b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 2cbc4619b4ce..d0a2bee9035a 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -2079,11 +2079,15 @@ void intel_hdcp_update_pipe(struct > intel_atomic_state *state, > struct intel_connector *connector = > to_intel_connector(conn_state->connector); > struct intel_hdcp *hdcp = &connector->hdcp; > - bool content_protection_type_changed = > + bool content_protection_type_changed; > + > + if (!connector->hdcp.shim) > + return; > + > + content_protection_type_changed = > (conn_state->hdcp_content_type != hdcp->content_type && > conn_state->content_protection != > DRM_MODE_CONTENT_PROTECTION_UNDESIRED); > - > /* > * During the HDCP encryption session if Type change is requested, > * disable the HDCP and reenable it with new TYPE value. > -- > 2.26.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
