> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Ville Syrjala > Sent: Monday, February 20, 2023 8:48 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Subject: [PATCH 2/2] drm/i915: Drop useless intel_dp_has_audio() > argument Append display, else all looks good. Reviewed-by: Uma Shankar <uma.shankar@xxxxxxxxx> > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > intel_dp_has_audio() has no need for the crtc_state, so don't pass it in. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index b77bd4565864..d25a93258f8b 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -2003,7 +2003,6 @@ intel_dp_drrs_compute_config(struct intel_connector > *connector, } > > static bool intel_dp_has_audio(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > const struct drm_connector_state *conn_state) { > struct drm_i915_private *i915 = to_i915(encoder->base.dev); @@ -2069,7 > +2068,7 @@ intel_dp_audio_compute_config(struct intel_encoder *encoder, > struct drm_connector *connector = conn_state->connector; > > pipe_config->sdp_split_enable = > - intel_dp_has_audio(encoder, pipe_config, conn_state) && > + intel_dp_has_audio(encoder, conn_state) && > intel_dp_is_uhbr(pipe_config); > > drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] SDP split enable: %s\n", > @@ -2093,7 +2092,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, > pipe_config->has_pch_encoder = true; > > pipe_config->has_audio = > - intel_dp_has_audio(encoder, pipe_config, conn_state) && > + intel_dp_has_audio(encoder, conn_state) && > intel_audio_compute_config(encoder, pipe_config, conn_state); > > fixed_mode = intel_panel_fixed_mode(connector, adjusted_mode); > -- > 2.39.2