> -----Original Message-----
> From: Intel-xe <intel-xe-boun...@lists.freedesktop.org> On Behalf Of Ville
> Syrjala
> Sent: Wednesday, June 11, 2025 9:23 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: intel...@lists.freedesktop.org
> Subject: [PATCH 8/9] drm/i915/dmc: Pass crtc_state to intel_dmc_{enable,
> disable}_pipe()
>
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> I'll need to examine the crtc state during intel_dmc_enable_pipe().
> To that end pass the whole crtc into intel_dmc_{enable,disable}_pipe().
Changes Look Good to me.
Reviewed-by: Uma Shankar <uma.shan...@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 16 ++++++++++++----
> drivers/gpu/drm/i915/display/intel_dmc.c | 10 ++++++++--
> drivers/gpu/drm/i915/display/intel_dmc.h | 5 +++--
> .../gpu/drm/i915/display/intel_modeset_setup.c | 2 +-
> 4 files changed, 24 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index b0c7c46ffbe2..eeb3aa7757f0 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -1659,8 +1659,12 @@ static void hsw_crtc_enable(struct intel_atomic_state
> *state,
>
> if (drm_WARN_ON(display->drm, crtc->active))
> return;
> - for_each_pipe_crtc_modeset_enable(display, pipe_crtc, new_crtc_state, i)
> - intel_dmc_enable_pipe(display, pipe_crtc->pipe);
> + for_each_pipe_crtc_modeset_enable(display, pipe_crtc, new_crtc_state, i)
> {
> + const struct intel_crtc_state *new_pipe_crtc_state =
> + intel_atomic_get_new_crtc_state(state, pipe_crtc);
> +
> + intel_dmc_enable_pipe(new_pipe_crtc_state);
> + }
>
> intel_encoders_pre_pll_enable(state, crtc);
>
> @@ -1798,8 +1802,12 @@ static void hsw_crtc_disable(struct intel_atomic_state
> *state,
>
> intel_encoders_post_pll_disable(state, crtc);
>
> - for_each_pipe_crtc_modeset_disable(display, pipe_crtc, old_crtc_state,
> i)
> - intel_dmc_disable_pipe(display, pipe_crtc->pipe);
> + for_each_pipe_crtc_modeset_disable(display, pipe_crtc, old_crtc_state,
> i)
> {
> + const struct intel_crtc_state *old_pipe_crtc_state =
> + intel_atomic_get_old_crtc_state(state, pipe_crtc);
> +
> + intel_dmc_disable_pipe(old_pipe_crtc_state);
> + }
> }
>
> /* Prefer intel_encoder_is_combo() */
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c
> b/drivers/gpu/drm/i915/display/intel_dmc.c
> index 37618797d931..0562ee1d0905 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -663,8 +663,11 @@ static bool need_pipedmc_load_mmio(struct
> intel_display *display, enum pipe pipe
> return DISPLAY_VER(display) >= 30 && pipe >= PIPE_C; }
>
> -void intel_dmc_enable_pipe(struct intel_display *display, enum pipe pipe)
> +void intel_dmc_enable_pipe(const struct intel_crtc_state *crtc_state)
> {
> + struct intel_display *display = to_intel_display(crtc_state);
> + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> + enum pipe pipe = crtc->pipe;
> enum intel_dmc_id dmc_id = PIPE_TO_DMC_ID(pipe);
>
> if (!is_valid_dmc_id(dmc_id) || !has_dmc_id_fw(display, dmc_id)) @@ -
> 688,8 +691,11 @@ void intel_dmc_enable_pipe(struct intel_display *display,
> enum pipe pipe)
> intel_de_rmw(display, PIPEDMC_CONTROL(pipe), 0,
> PIPEDMC_ENABLE); }
>
> -void intel_dmc_disable_pipe(struct intel_display *display, enum pipe pipe)
> +void intel_dmc_disable_pipe(const struct intel_crtc_state *crtc_state)
> {
> + struct intel_display *display = to_intel_display(crtc_state);
> + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> + enum pipe pipe = crtc->pipe;
> enum intel_dmc_id dmc_id = PIPE_TO_DMC_ID(pipe);
>
> if (!is_valid_dmc_id(dmc_id) || !has_dmc_id_fw(display, dmc_id)) diff
> --git
> a/drivers/gpu/drm/i915/display/intel_dmc.h
> b/drivers/gpu/drm/i915/display/intel_dmc.h
> index a3792052078a..7820fa5aed3e 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.h
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.h
> @@ -10,14 +10,15 @@
>
> enum pipe;
> struct drm_printer;
> +struct intel_crtc_state;
> struct intel_display;
> struct intel_dmc_snapshot;
>
> void intel_dmc_init(struct intel_display *display); void
> intel_dmc_load_program(struct intel_display *display); void
> intel_dmc_disable_program(struct intel_display *display); -void
> intel_dmc_enable_pipe(struct intel_display *display, enum pipe pipe); -void
> intel_dmc_disable_pipe(struct intel_display *display, enum pipe pipe);
> +void intel_dmc_enable_pipe(const struct intel_crtc_state *crtc_state);
> +void intel_dmc_disable_pipe(const struct intel_crtc_state *crtc_state);
> void intel_dmc_block_pkgc(struct intel_display *display, enum pipe pipe,
> bool block);
> void intel_dmc_start_pkgc_exit_at_start_of_undelayed_vblank(struct
> intel_display
> *display, diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> index 05e1b309ba2c..8415f3d703ed 100644
> --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> @@ -961,7 +961,7 @@ void intel_modeset_setup_hw_state(struct intel_display
> *display,
> drm_crtc_vblank_reset(&crtc->base);
>
> if (crtc_state->hw.active) {
> - intel_dmc_enable_pipe(display, crtc->pipe);
> + intel_dmc_enable_pipe(crtc_state);
> intel_crtc_vblank_on(crtc_state);
> }
> }
> --
> 2.49.0
