| Message ID | 20231106211915.13406-11-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Audio fastset, and some fixes | expand |
On Mon, 06 Nov 2023, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Relocate the audio enable/disable from the full modeset hooks into > the common pre/post plane update stage of the commit. Audio fastset > is within easy reach now. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 31 +++++++++++++++----- > 1 file changed, 24 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index d606befa007c..98d4fcd28073 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -990,6 +990,24 @@ static bool vrr_disabling(const struct intel_crtc_state *old_crtc_state, > vrr_params_changed(old_crtc_state, new_crtc_state))); > } > > +static bool audio_enabling(const struct intel_crtc_state *old_crtc_state, > + const struct intel_crtc_state *new_crtc_state) > +{ > + if (!new_crtc_state->hw.active) > + return false; Makes me wonder if these check should've been added to the is_enabling/is_disabling macros instead. *shrug* Reviewed-by: Jani Nikula <jani.nikula@intel.com> > + > + return is_enabling(has_audio, old_crtc_state, new_crtc_state); > +} > + > +static bool audio_disabling(const struct intel_crtc_state *old_crtc_state, > + const struct intel_crtc_state *new_crtc_state) > +{ > + if (!old_crtc_state->hw.active) > + return false; > + > + return is_disabling(has_audio, old_crtc_state, new_crtc_state); > +} > + > #undef is_disabling > #undef is_enabling > > @@ -1030,6 +1048,9 @@ static void intel_post_plane_update(struct intel_atomic_state *state, > > if (intel_crtc_needs_color_update(new_crtc_state)) > intel_color_post_update(new_crtc_state); > + > + if (audio_enabling(old_crtc_state, new_crtc_state)) > + intel_encoders_audio_enable(state, crtc); > } > > static void intel_crtc_enable_flip_done(struct intel_atomic_state *state, > @@ -1113,6 +1134,9 @@ static void intel_pre_plane_update(struct intel_atomic_state *state, > intel_crtc_update_active_timings(old_crtc_state, false); > } > > + if (audio_disabling(old_crtc_state, new_crtc_state)) > + intel_encoders_audio_disable(state, crtc); > + > intel_drrs_deactivate(old_crtc_state); > > intel_psr_pre_plane_update(state, crtc); > @@ -1503,7 +1527,6 @@ static void ilk_crtc_enable(struct intel_atomic_state *state, > intel_crtc_vblank_on(new_crtc_state); > > intel_encoders_enable(state, crtc); > - intel_encoders_audio_enable(state, crtc); > > if (HAS_PCH_CPT(dev_priv)) > intel_wait_for_pipe_scanline_moving(crtc); > @@ -1677,7 +1700,6 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, > intel_crtc_vblank_on(new_crtc_state); > > intel_encoders_enable(state, crtc); > - intel_encoders_audio_enable(state, crtc); > > if (psl_clkgate_wa) { > intel_crtc_wait_for_next_vblank(crtc); > @@ -1729,7 +1751,6 @@ static void ilk_crtc_disable(struct intel_atomic_state *state, > intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false); > intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, false); > > - intel_encoders_audio_disable(state, crtc); > intel_encoders_disable(state, crtc); > > intel_crtc_vblank_off(old_crtc_state); > @@ -1764,7 +1785,6 @@ static void hsw_crtc_disable(struct intel_atomic_state *state, > * Need care with mst->ddi interactions. > */ > if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { > - intel_encoders_audio_disable(state, crtc); > intel_encoders_disable(state, crtc); > intel_encoders_post_disable(state, crtc); > } > @@ -2034,7 +2054,6 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state, > intel_crtc_vblank_on(new_crtc_state); > > intel_encoders_enable(state, crtc); > - intel_encoders_audio_enable(state, crtc); > } > > static void i9xx_crtc_enable(struct intel_atomic_state *state, > @@ -2076,7 +2095,6 @@ static void i9xx_crtc_enable(struct intel_atomic_state *state, > intel_crtc_vblank_on(new_crtc_state); > > intel_encoders_enable(state, crtc); > - intel_encoders_audio_enable(state, crtc); > > /* prevents spurious underruns */ > if (DISPLAY_VER(dev_priv) == 2) > @@ -2113,7 +2131,6 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state, > if (DISPLAY_VER(dev_priv) == 2) > intel_crtc_wait_for_next_vblank(crtc); > > - intel_encoders_audio_disable(state, crtc); > intel_encoders_disable(state, crtc); > > intel_crtc_vblank_off(old_crtc_state);
On Mon, Nov 13, 2023 at 05:49:32PM +0200, Jani Nikula wrote: > On Mon, 06 Nov 2023, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > Relocate the audio enable/disable from the full modeset hooks into > > the common pre/post plane update stage of the commit. Audio fastset > > is within easy reach now. > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_display.c | 31 +++++++++++++++----- > > 1 file changed, 24 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > > index d606befa007c..98d4fcd28073 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -990,6 +990,24 @@ static bool vrr_disabling(const struct intel_crtc_state *old_crtc_state, > > vrr_params_changed(old_crtc_state, new_crtc_state))); > > } > > > > +static bool audio_enabling(const struct intel_crtc_state *old_crtc_state, > > + const struct intel_crtc_state *new_crtc_state) > > +{ > > + if (!new_crtc_state->hw.active) > > + return false; > > Makes me wonder if these check should've been added to the > is_enabling/is_disabling macros instead. *shrug* I had it like that originally, but then I decided against it for some reason that I seem to have forgotten already... I *think* I was planning to use is_{enabling,disabling}() in some other context where that check doesn't make sense. But I think in the end I convinced myself that I can't actually do that due to other reasons. So yeah, putting these into is_{enabling,disabling}() would probably make sense. But I think I'll have to mull it over a bit more. > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Thanks. > > > > + > > + return is_enabling(has_audio, old_crtc_state, new_crtc_state); > > +} > > + > > +static bool audio_disabling(const struct intel_crtc_state *old_crtc_state, > > + const struct intel_crtc_state *new_crtc_state) > > +{ > > + if (!old_crtc_state->hw.active) > > + return false; > > + > > + return is_disabling(has_audio, old_crtc_state, new_crtc_state); > > +} > > + > > #undef is_disabling > > #undef is_enabling > > > > @@ -1030,6 +1048,9 @@ static void intel_post_plane_update(struct intel_atomic_state *state, > > > > if (intel_crtc_needs_color_update(new_crtc_state)) > > intel_color_post_update(new_crtc_state); > > + > > + if (audio_enabling(old_crtc_state, new_crtc_state)) > > + intel_encoders_audio_enable(state, crtc); > > } > > > > static void intel_crtc_enable_flip_done(struct intel_atomic_state *state, > > @@ -1113,6 +1134,9 @@ static void intel_pre_plane_update(struct intel_atomic_state *state, > > intel_crtc_update_active_timings(old_crtc_state, false); > > } > > > > + if (audio_disabling(old_crtc_state, new_crtc_state)) > > + intel_encoders_audio_disable(state, crtc); > > + > > intel_drrs_deactivate(old_crtc_state); > > > > intel_psr_pre_plane_update(state, crtc); > > @@ -1503,7 +1527,6 @@ static void ilk_crtc_enable(struct intel_atomic_state *state, > > intel_crtc_vblank_on(new_crtc_state); > > > > intel_encoders_enable(state, crtc); > > - intel_encoders_audio_enable(state, crtc); > > > > if (HAS_PCH_CPT(dev_priv)) > > intel_wait_for_pipe_scanline_moving(crtc); > > @@ -1677,7 +1700,6 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, > > intel_crtc_vblank_on(new_crtc_state); > > > > intel_encoders_enable(state, crtc); > > - intel_encoders_audio_enable(state, crtc); > > > > if (psl_clkgate_wa) { > > intel_crtc_wait_for_next_vblank(crtc); > > @@ -1729,7 +1751,6 @@ static void ilk_crtc_disable(struct intel_atomic_state *state, > > intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false); > > intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, false); > > > > - intel_encoders_audio_disable(state, crtc); > > intel_encoders_disable(state, crtc); > > > > intel_crtc_vblank_off(old_crtc_state); > > @@ -1764,7 +1785,6 @@ static void hsw_crtc_disable(struct intel_atomic_state *state, > > * Need care with mst->ddi interactions. > > */ > > if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { > > - intel_encoders_audio_disable(state, crtc); > > intel_encoders_disable(state, crtc); > > intel_encoders_post_disable(state, crtc); > > } > > @@ -2034,7 +2054,6 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state, > > intel_crtc_vblank_on(new_crtc_state); > > > > intel_encoders_enable(state, crtc); > > - intel_encoders_audio_enable(state, crtc); > > } > > > > static void i9xx_crtc_enable(struct intel_atomic_state *state, > > @@ -2076,7 +2095,6 @@ static void i9xx_crtc_enable(struct intel_atomic_state *state, > > intel_crtc_vblank_on(new_crtc_state); > > > > intel_encoders_enable(state, crtc); > > - intel_encoders_audio_enable(state, crtc); > > > > /* prevents spurious underruns */ > > if (DISPLAY_VER(dev_priv) == 2) > > @@ -2113,7 +2131,6 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state, > > if (DISPLAY_VER(dev_priv) == 2) > > intel_crtc_wait_for_next_vblank(crtc); > > > > - intel_encoders_audio_disable(state, crtc); > > intel_encoders_disable(state, crtc); > > > > intel_crtc_vblank_off(old_crtc_state); > > -- > Jani Nikula, Intel
On Tue, Nov 14, 2023 at 10:57:29AM +0200, Ville Syrjälä wrote: > On Mon, Nov 13, 2023 at 05:49:32PM +0200, Jani Nikula wrote: > > On Mon, 06 Nov 2023, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > > > Relocate the audio enable/disable from the full modeset hooks into > > > the common pre/post plane update stage of the commit. Audio fastset > > > is within easy reach now. > > > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > --- > > > drivers/gpu/drm/i915/display/intel_display.c | 31 +++++++++++++++----- > > > 1 file changed, 24 insertions(+), 7 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > > > index d606befa007c..98d4fcd28073 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > @@ -990,6 +990,24 @@ static bool vrr_disabling(const struct intel_crtc_state *old_crtc_state, > > > vrr_params_changed(old_crtc_state, new_crtc_state))); > > > } > > > > > > +static bool audio_enabling(const struct intel_crtc_state *old_crtc_state, > > > + const struct intel_crtc_state *new_crtc_state) > > > +{ > > > + if (!new_crtc_state->hw.active) > > > + return false; > > > > Makes me wonder if these check should've been added to the > > is_enabling/is_disabling macros instead. *shrug* > > I had it like that originally, but then I decided against it for > some reason that I seem to have forgotten already... > > I *think* I was planning to use is_{enabling,disabling}() in some > other context where that check doesn't make sense. But I think in > the end I convinced myself that I can't actually do that due to > other reasons. So yeah, putting these into is_{enabling,disabling}() > would probably make sense. But I think I'll have to mull it over a > bit more. After further thought it won't work because we do stuff like is_enabling(...) || other_conditions So we need the crtc_state->hw.active check to catch both sides of the OR. > > > > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > Thanks. > > > > > > > > + > > > + return is_enabling(has_audio, old_crtc_state, new_crtc_state); > > > +} > > > + > > > +static bool audio_disabling(const struct intel_crtc_state *old_crtc_state, > > > + const struct intel_crtc_state *new_crtc_state) > > > +{ > > > + if (!old_crtc_state->hw.active) > > > + return false; > > > + > > > + return is_disabling(has_audio, old_crtc_state, new_crtc_state); > > > +} > > > + > > > #undef is_disabling > > > #undef is_enabling > > > > > > @@ -1030,6 +1048,9 @@ static void intel_post_plane_update(struct intel_atomic_state *state, > > > > > > if (intel_crtc_needs_color_update(new_crtc_state)) > > > intel_color_post_update(new_crtc_state); > > > + > > > + if (audio_enabling(old_crtc_state, new_crtc_state)) > > > + intel_encoders_audio_enable(state, crtc); > > > } > > > > > > static void intel_crtc_enable_flip_done(struct intel_atomic_state *state, > > > @@ -1113,6 +1134,9 @@ static void intel_pre_plane_update(struct intel_atomic_state *state, > > > intel_crtc_update_active_timings(old_crtc_state, false); > > > } > > > > > > + if (audio_disabling(old_crtc_state, new_crtc_state)) > > > + intel_encoders_audio_disable(state, crtc); > > > + > > > intel_drrs_deactivate(old_crtc_state); > > > > > > intel_psr_pre_plane_update(state, crtc); > > > @@ -1503,7 +1527,6 @@ static void ilk_crtc_enable(struct intel_atomic_state *state, > > > intel_crtc_vblank_on(new_crtc_state); > > > > > > intel_encoders_enable(state, crtc); > > > - intel_encoders_audio_enable(state, crtc); > > > > > > if (HAS_PCH_CPT(dev_priv)) > > > intel_wait_for_pipe_scanline_moving(crtc); > > > @@ -1677,7 +1700,6 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, > > > intel_crtc_vblank_on(new_crtc_state); > > > > > > intel_encoders_enable(state, crtc); > > > - intel_encoders_audio_enable(state, crtc); > > > > > > if (psl_clkgate_wa) { > > > intel_crtc_wait_for_next_vblank(crtc); > > > @@ -1729,7 +1751,6 @@ static void ilk_crtc_disable(struct intel_atomic_state *state, > > > intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false); > > > intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, false); > > > > > > - intel_encoders_audio_disable(state, crtc); > > > intel_encoders_disable(state, crtc); > > > > > > intel_crtc_vblank_off(old_crtc_state); > > > @@ -1764,7 +1785,6 @@ static void hsw_crtc_disable(struct intel_atomic_state *state, > > > * Need care with mst->ddi interactions. > > > */ > > > if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { > > > - intel_encoders_audio_disable(state, crtc); > > > intel_encoders_disable(state, crtc); > > > intel_encoders_post_disable(state, crtc); > > > } > > > @@ -2034,7 +2054,6 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state, > > > intel_crtc_vblank_on(new_crtc_state); > > > > > > intel_encoders_enable(state, crtc); > > > - intel_encoders_audio_enable(state, crtc); > > > } > > > > > > static void i9xx_crtc_enable(struct intel_atomic_state *state, > > > @@ -2076,7 +2095,6 @@ static void i9xx_crtc_enable(struct intel_atomic_state *state, > > > intel_crtc_vblank_on(new_crtc_state); > > > > > > intel_encoders_enable(state, crtc); > > > - intel_encoders_audio_enable(state, crtc); > > > > > > /* prevents spurious underruns */ > > > if (DISPLAY_VER(dev_priv) == 2) > > > @@ -2113,7 +2131,6 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state, > > > if (DISPLAY_VER(dev_priv) == 2) > > > intel_crtc_wait_for_next_vblank(crtc); > > > > > > - intel_encoders_audio_disable(state, crtc); > > > intel_encoders_disable(state, crtc); > > > > > > intel_crtc_vblank_off(old_crtc_state); > > > > -- > > Jani Nikula, Intel > > -- > Ville Syrjälä > Intel
On Wed, 15 Nov 2023, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > After further thought it won't work because we do stuff like > is_enabling(...) || other_conditions > > So we need the crtc_state->hw.active check to catch both sides > of the OR. Ah, true.
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index d606befa007c..98d4fcd28073 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -990,6 +990,24 @@ static bool vrr_disabling(const struct intel_crtc_state *old_crtc_state, vrr_params_changed(old_crtc_state, new_crtc_state))); } +static bool audio_enabling(const struct intel_crtc_state *old_crtc_state, + const struct intel_crtc_state *new_crtc_state) +{ + if (!new_crtc_state->hw.active) + return false; + + return is_enabling(has_audio, old_crtc_state, new_crtc_state); +} + +static bool audio_disabling(const struct intel_crtc_state *old_crtc_state, + const struct intel_crtc_state *new_crtc_state) +{ + if (!old_crtc_state->hw.active) + return false; + + return is_disabling(has_audio, old_crtc_state, new_crtc_state); +} + #undef is_disabling #undef is_enabling @@ -1030,6 +1048,9 @@ static void intel_post_plane_update(struct intel_atomic_state *state, if (intel_crtc_needs_color_update(new_crtc_state)) intel_color_post_update(new_crtc_state); + + if (audio_enabling(old_crtc_state, new_crtc_state)) + intel_encoders_audio_enable(state, crtc); } static void intel_crtc_enable_flip_done(struct intel_atomic_state *state, @@ -1113,6 +1134,9 @@ static void intel_pre_plane_update(struct intel_atomic_state *state, intel_crtc_update_active_timings(old_crtc_state, false); } + if (audio_disabling(old_crtc_state, new_crtc_state)) + intel_encoders_audio_disable(state, crtc); + intel_drrs_deactivate(old_crtc_state); intel_psr_pre_plane_update(state, crtc); @@ -1503,7 +1527,6 @@ static void ilk_crtc_enable(struct intel_atomic_state *state, intel_crtc_vblank_on(new_crtc_state); intel_encoders_enable(state, crtc); - intel_encoders_audio_enable(state, crtc); if (HAS_PCH_CPT(dev_priv)) intel_wait_for_pipe_scanline_moving(crtc); @@ -1677,7 +1700,6 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, intel_crtc_vblank_on(new_crtc_state); intel_encoders_enable(state, crtc); - intel_encoders_audio_enable(state, crtc); if (psl_clkgate_wa) { intel_crtc_wait_for_next_vblank(crtc); @@ -1729,7 +1751,6 @@ static void ilk_crtc_disable(struct intel_atomic_state *state, intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false); intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, false); - intel_encoders_audio_disable(state, crtc); intel_encoders_disable(state, crtc); intel_crtc_vblank_off(old_crtc_state); @@ -1764,7 +1785,6 @@ static void hsw_crtc_disable(struct intel_atomic_state *state, * Need care with mst->ddi interactions. */ if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { - intel_encoders_audio_disable(state, crtc); intel_encoders_disable(state, crtc); intel_encoders_post_disable(state, crtc); } @@ -2034,7 +2054,6 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state, intel_crtc_vblank_on(new_crtc_state); intel_encoders_enable(state, crtc); - intel_encoders_audio_enable(state, crtc); } static void i9xx_crtc_enable(struct intel_atomic_state *state, @@ -2076,7 +2095,6 @@ static void i9xx_crtc_enable(struct intel_atomic_state *state, intel_crtc_vblank_on(new_crtc_state); intel_encoders_enable(state, crtc); - intel_encoders_audio_enable(state, crtc); /* prevents spurious underruns */ if (DISPLAY_VER(dev_priv) == 2) @@ -2113,7 +2131,6 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state, if (DISPLAY_VER(dev_priv) == 2) intel_crtc_wait_for_next_vblank(crtc); - intel_encoders_audio_disable(state, crtc); intel_encoders_disable(state, crtc); intel_crtc_vblank_off(old_crtc_state);