On Wed, May 13, 2026 at 10:58:37AM +0300, Jani Nikula wrote: > In preparation for always passing struct intel_display to > for_each_intel_crtc*() family of iterators, start off by unifying their > usage to always having struct intel_display *display around, and passing > display->drm to them. > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/i9xx_wm.c | 3 ++- > drivers/gpu/drm/i915/display/intel_display.c | 3 ++- > drivers/gpu/drm/i915/display/intel_plane.c | 3 ++- > 3 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c > b/drivers/gpu/drm/i915/display/i9xx_wm.c > index 33d8f6b6afea..4cd07410ad72 100644 > --- a/drivers/gpu/drm/i915/display/i9xx_wm.c > +++ b/drivers/gpu/drm/i915/display/i9xx_wm.c > @@ -3533,10 +3533,11 @@ static void ilk_pipe_wm_get_hw_state(struct > intel_crtc *crtc) > > static int ilk_sanitize_watermarks_add_affected(struct drm_atomic_commit > *state) > { > + struct intel_display *display = to_intel_display(state->dev); > struct drm_plane *plane; > struct intel_crtc *crtc; > > - for_each_intel_crtc(state->dev, crtc) { > + for_each_intel_crtc(display->drm, crtc) { > struct intel_crtc_state *crtc_state; > > crtc_state = intel_atomic_get_crtc_state(state, crtc); > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index 682a0514ec81..7126a88ca090 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -5692,6 +5692,7 @@ int intel_modeset_commit_pipes(struct intel_display > *display, > */ > static int hsw_mode_set_planes_workaround(struct intel_atomic_state *state) > { > + struct intel_display *display = to_intel_display(state); > struct intel_crtc_state *crtc_state; > struct intel_crtc *crtc; > struct intel_crtc_state *first_crtc_state = NULL; > @@ -5719,7 +5720,7 @@ static int hsw_mode_set_planes_workaround(struct > intel_atomic_state *state) > return 0; > > /* w/a possibly needed, check how many crtc's are already enabled. */ > - for_each_intel_crtc(state->base.dev, crtc) { > + for_each_intel_crtc(display->drm, crtc) { > crtc_state = intel_atomic_get_crtc_state(&state->base, crtc); > if (IS_ERR(crtc_state)) > return PTR_ERR(crtc_state); > diff --git a/drivers/gpu/drm/i915/display/intel_plane.c > b/drivers/gpu/drm/i915/display/intel_plane.c > index a1f9558d53af..911ae261d1b5 100644 > --- a/drivers/gpu/drm/i915/display/intel_plane.c > +++ b/drivers/gpu/drm/i915/display/intel_plane.c > @@ -1794,6 +1794,7 @@ static u8 intel_joiner_affected_planes(struct > intel_atomic_state *state, > static int intel_joiner_add_affected_planes(struct intel_atomic_state *state, > u8 joined_pipes) > { > + struct intel_display *display = to_intel_display(state); > u8 prev_affected_planes, affected_planes = 0; > > /* > @@ -1811,7 +1812,7 @@ static int intel_joiner_add_affected_planes(struct > intel_atomic_state *state, > do { > struct intel_crtc *crtc; > > - for_each_intel_crtc_in_pipe_mask(state->base.dev, crtc, > joined_pipes) { > + for_each_intel_crtc_in_pipe_mask(display->drm, crtc, > joined_pipes) { > int ret; > > ret = intel_crtc_add_planes_to_state(state, crtc, > affected_planes); > -- > 2.47.3 -- Ville Syrjälä Intel
