On 2020-08-05 at 17:15:20 +0530, Anshuman Gupta wrote: > Currently intel_hdcp_update_pipe() is also getting called for non-hdcp > connectors and get through 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: Ramalingam C <ramalingam.c@xxxxxxxxx> > > v2: > - rebased. > > Reviewed-by: Uma Shankar <uma.shankar@xxxxxxxxx> > 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 89a4d294822d..a1e0d518e529 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -2082,11 +2082,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, desired_and_not_enabled = false; > + > + 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); > - bool desired_and_not_enabled = false; > > /* > * During the HDCP encryption session if Type change is requested, > -- > 2.26.2 > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
