drm/i915/display: pass struct intel_display to all for_each_intel_crtc*() macros

Now that the for_each_intel_crtc*() iterator macros primarily use
display->pipe_list for iteration, it's more convenient to pass struct
intel_display to them directly instead of struct drm_device. Make it so.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/90ec6b84d772a4842d4816efc10042ec4403e996.1778659089.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c b/drivers/gpu/drm/i915/display/i9xx_wm.c
index 4cd07410ad72cc197a1bc5f3a6edd24105b82189..19b61d4c1fae300115126571ad92aefb1c6c6a84 100644 (file)
--- a/drivers/gpu/drm/i915/display/i9xx_wm.c
+++ b/drivers/gpu/drm/i915/display/i9xx_wm.c
@@ -640,7 +640,7 @@ static struct intel_crtc *single_enabled_crtc(struct intel_display *display)
 {
        struct intel_crtc *crtc, *enabled = NULL;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                if (intel_crtc_active(crtc)) {
                        if (enabled)
                                return NULL;
@@ -1393,7 +1393,7 @@ static void g4x_merge_wm(struct intel_display *display,
        wm->hpll_en = true;
        wm->fbc_en = true;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct g4x_wm_state *wm_state = &crtc->wm.active.g4x;
 
                if (!crtc->active)
@@ -1415,7 +1415,7 @@ static void g4x_merge_wm(struct intel_display *display,
                wm->fbc_en = false;
        }
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct g4x_wm_state *wm_state = &crtc->wm.active.g4x;
                enum pipe pipe = crtc->pipe;
 
@@ -2034,7 +2034,7 @@ static void vlv_merge_wm(struct intel_display *display,
        wm->level = display->wm.num_levels - 1;
        wm->cxsr = true;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct vlv_wm_state *wm_state = &crtc->wm.active.vlv;
 
                if (!crtc->active)
@@ -2053,7 +2053,7 @@ static void vlv_merge_wm(struct intel_display *display,
        if (num_active_pipes > 1)
                wm->level = VLV_WM_LEVEL_PM2;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct vlv_wm_state *wm_state = &crtc->wm.active.vlv;
                enum pipe pipe = crtc->pipe;
 
@@ -3078,7 +3078,7 @@ static void ilk_merge_wm_level(struct intel_display *display,
 
        ret_wm->enable = true;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct intel_pipe_wm *active = &crtc->wm.active.ilk;
                const struct intel_wm_level *wm = &active->wm[level];
 
@@ -3218,7 +3218,7 @@ static void ilk_compute_wm_results(struct intel_display *display,
        }
 
        /* LP0 register values */
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                enum pipe pipe = crtc->pipe;
                const struct intel_pipe_wm *pipe_wm = &crtc->wm.active.ilk;
                const struct intel_wm_level *r = &pipe_wm->wm[0];
@@ -3416,7 +3416,7 @@ static void ilk_compute_wm_config(struct intel_display *display,
        struct intel_crtc *crtc;
 
        /* Compute the currently _active_ config */
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct intel_pipe_wm *wm = &crtc->wm.active.ilk;
 
                if (!wm->pipe_enabled)
@@ -3537,7 +3537,7 @@ static int ilk_sanitize_watermarks_add_affected(struct drm_atomic_commit *state)
        struct drm_plane *plane;
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state;
 
                crtc_state = intel_atomic_get_crtc_state(state, crtc);
@@ -3770,7 +3770,7 @@ static void g4x_wm_get_hw_state(struct intel_display *display)
 
        wm->cxsr = intel_de_read(display, FW_BLC_SELF) & FW_BLC_SELF_EN;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                struct g4x_wm_state *active = &crtc->wm.active.g4x;
@@ -3885,7 +3885,7 @@ static void g4x_wm_sanitize(struct intel_display *display)
                }
        }
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                int ret;
@@ -3952,7 +3952,7 @@ static void vlv_wm_get_hw_state(struct intel_display *display)
                vlv_punit_put(display);
        }
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                struct vlv_wm_state *active = &crtc->wm.active.vlv;
@@ -4034,7 +4034,7 @@ static void vlv_wm_sanitize(struct intel_display *display)
                }
        }
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                int ret;
@@ -4075,7 +4075,7 @@ static void ilk_wm_get_hw_state(struct intel_display *display)
 
        ilk_init_lp_watermarks(display);
 
-       for_each_intel_crtc(display->drm, crtc)
+       for_each_intel_crtc(display, crtc)
                ilk_pipe_wm_get_hw_state(crtc);
 
        hw->wm_lp[0] = intel_de_read(display, WM1_LP_ILK);

diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index d7b2bc80f8e35857022a78e126f1a68c886785a0..07f711d6c7626b7510f18a911abc6c8eda18969d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -1429,7 +1429,7 @@ void intel_bw_update_hw_state(struct intel_display *display)
 
        bw_state->pipe_sagv_reject = 0;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                enum pipe pipe = crtc->pipe;

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index a1bf01021d65d2cc3c75d4314f521a98d529a321..2fa7e8c3bb264a8960095f6d4310469e01f3e3f7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -3647,7 +3647,7 @@ void intel_cdclk_update_hw_state(struct intel_display *display)
        cdclk_state->enabled_pipes = 0;
        cdclk_state->active_pipes = 0;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                enum pipe pipe = crtc->pipe;

diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index b7600cecafc859184dd94e188a5bcc5a8ca8526e..f3403128a313b7b89b0b7ae78eeb1bd271906191 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -56,7 +56,7 @@ struct intel_crtc *intel_crtc_for_pipe(struct intel_display *display,
 {
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                if (crtc->pipe == pipe)
                        return crtc;
        }

diff --git a/drivers/gpu/drm/i915/display/intel_dbuf_bw.c b/drivers/gpu/drm/i915/display/intel_dbuf_bw.c
index 0562d4df6a078c7351d2d5c9ee67e21087afe5c0..1f38317b38bbc2ccf08ad8949927eedcc176dcb7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dbuf_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_dbuf_bw.c
@@ -236,7 +236,7 @@ void intel_dbuf_bw_update_hw_state(struct intel_display *display)
        if (DISPLAY_VER(display) < 9)
                return;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
 

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 86520848892e0cb2c3dce9364f86fe4dd474b5d2..ad6b28e78cc56f1b5dad20604dafe074f7b58a96 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3672,7 +3672,7 @@ void intel_ddi_update_active_dpll(struct intel_atomic_state *state,
        if (!intel_encoder_is_tc(encoder) || !display->dpll.mgr)
                return;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, pipe_crtc,
+       for_each_intel_crtc_in_pipe_mask(display, pipe_crtc,
                                         intel_crtc_joined_pipe_mask(crtc_state))
                intel_dpll_update_active(state, pipe_crtc, encoder);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index d741e2f7105f325ec28ca47dab63642beace701d..af9a9bc52d114f35f29c0ad752184ea487238440 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -717,7 +717,7 @@ bool intel_has_pending_fb_unpin(struct intel_display *display)
        struct intel_crtc *crtc;
        bool cleanup_done;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct drm_crtc_commit *commit;
                spin_lock(&crtc->base.commit_lock);
                commit = list_first_entry_or_null(&crtc->base.commit_list,
@@ -742,7 +742,7 @@ void intel_display_flush_cleanup_work(struct intel_display *display)
 {
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct drm_crtc_commit *commit;
 
                spin_lock(&crtc->base.commit_lock);
@@ -3527,7 +3527,7 @@ static void enabled_uncompressed_joiner_pipes(struct intel_display *display,
        if (!HAS_UNCOMPRESSED_JOINER(display))
                return;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc,
+       for_each_intel_crtc_in_pipe_mask(display, crtc,
                                         joiner_pipes(display)) {
                enum intel_display_power_domain power_domain;
                enum pipe pipe = crtc->pipe;
@@ -3555,7 +3555,7 @@ static void enabled_bigjoiner_pipes(struct intel_display *display,
        if (!HAS_BIGJOINER(display))
                return;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc,
+       for_each_intel_crtc_in_pipe_mask(display, crtc,
                                         joiner_pipes(display)) {
                enum intel_display_power_domain power_domain;
                enum pipe pipe = crtc->pipe;
@@ -3624,7 +3624,7 @@ static void enabled_ultrajoiner_pipes(struct intel_display *display,
        if (!HAS_ULTRAJOINER(display))
                return;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc,
+       for_each_intel_crtc_in_pipe_mask(display, crtc,
                                         joiner_pipes(display)) {
                enum intel_display_power_domain power_domain;
                enum pipe pipe = crtc->pipe;
@@ -5587,7 +5587,7 @@ int intel_modeset_pipes_in_mask_early(struct intel_atomic_state *state,
        struct intel_display *display = to_intel_display(state);
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, mask) {
+       for_each_intel_crtc_in_pipe_mask(display, crtc, mask) {
                struct intel_crtc_state *crtc_state;
                int ret;
 
@@ -5634,7 +5634,7 @@ int intel_modeset_all_pipes_late(struct intel_atomic_state *state,
        struct intel_display *display = to_intel_display(state);
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state;
                int ret;
 
@@ -5675,7 +5675,7 @@ int intel_modeset_commit_pipes(struct intel_display *display,
        state->acquire_ctx = ctx;
        to_intel_atomic_state(state)->internal = true;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, pipe_mask) {
+       for_each_intel_crtc_in_pipe_mask(display, crtc, pipe_mask) {
                struct intel_crtc_state *crtc_state =
                        intel_atomic_get_crtc_state(state, crtc);
 
@@ -5730,7 +5730,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(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                crtc_state = intel_atomic_get_crtc_state(&state->base, crtc);
                if (IS_ERR(crtc_state))
                        return PTR_ERR(crtc_state);
@@ -5927,7 +5927,7 @@ static int intel_atomic_check_joiner(struct intel_atomic_state *state,
                return -EINVAL;
        }
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, secondary_crtc,
+       for_each_intel_crtc_in_pipe_mask(display, secondary_crtc,
                                         intel_crtc_joiner_secondary_pipes(primary_crtc_state)) {
                struct intel_crtc_state *secondary_crtc_state;
                int ret;
@@ -5970,7 +5970,7 @@ static void kill_joiner_secondaries(struct intel_atomic_state *state,
                intel_atomic_get_new_crtc_state(state, primary_crtc);
        struct intel_crtc *secondary_crtc;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, secondary_crtc,
+       for_each_intel_crtc_in_pipe_mask(display, secondary_crtc,
                                         intel_crtc_joiner_secondary_pipes(primary_crtc_state)) {
                struct intel_crtc_state *secondary_crtc_state =
                        intel_atomic_get_new_crtc_state(state, secondary_crtc);
@@ -6269,13 +6269,13 @@ static int intel_joiner_add_affected_crtcs(struct intel_atomic_state *state)
                        modeset_pipes |= crtc_state->joiner_pipes;
        }
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, affected_pipes) {
+       for_each_intel_crtc_in_pipe_mask(display, crtc, affected_pipes) {
                crtc_state = intel_atomic_get_crtc_state(&state->base, crtc);
                if (IS_ERR(crtc_state))
                        return PTR_ERR(crtc_state);
        }
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, modeset_pipes) {
+       for_each_intel_crtc_in_pipe_mask(display, crtc, modeset_pipes) {
                int ret;
 
                crtc_state = intel_atomic_get_new_crtc_state(state, crtc);
@@ -6760,7 +6760,7 @@ static void intel_enable_crtc(struct intel_atomic_state *state,
        if (!intel_crtc_needs_modeset(new_crtc_state))
                return;
 
-       for_each_intel_crtc_in_pipe_mask_reverse(display->drm, pipe_crtc,
+       for_each_intel_crtc_in_pipe_mask_reverse(display, pipe_crtc,
                                                 intel_crtc_joined_pipe_mask(new_crtc_state)) {
                const struct intel_crtc_state *pipe_crtc_state =
                        intel_atomic_get_new_crtc_state(state, pipe_crtc);
@@ -6898,7 +6898,7 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state,
         * We need to disable pipe CRC before disabling the pipe,
         * or we race against vblank off.
         */
-       for_each_intel_crtc_in_pipe_mask(display->drm, pipe_crtc,
+       for_each_intel_crtc_in_pipe_mask(display, pipe_crtc,
                                         intel_crtc_joined_pipe_mask(old_crtc_state))
                intel_crtc_disable_pipe_crc(pipe_crtc);
 
@@ -6906,7 +6906,7 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state,
 
        display->modeset.funcs->crtc_disable(state, crtc);
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, pipe_crtc,
+       for_each_intel_crtc_in_pipe_mask(display, pipe_crtc,
                                         intel_crtc_joined_pipe_mask(old_crtc_state)) {
                const struct intel_crtc_state *new_pipe_crtc_state =
                        intel_atomic_get_new_crtc_state(state, pipe_crtc);
@@ -7818,7 +7818,7 @@ static u32 intel_encoder_possible_crtcs(struct intel_encoder *encoder)
        struct intel_crtc *crtc;
        u32 possible_crtcs = 0;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, encoder->pipe_mask)
+       for_each_intel_crtc_in_pipe_mask(display, crtc, encoder->pipe_mask)
                possible_crtcs |= drm_crtc_mask(&crtc->base);
 
        return possible_crtcs;
@@ -8311,7 +8311,7 @@ int intel_initial_commit(struct intel_display *display)
        to_intel_atomic_state(state)->internal = true;
 
 retry:
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        intel_atomic_get_crtc_state(state, crtc);
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 72f33113a5a3ee1cc7f42b90f637e25ccef4be84..82c4aa9de7d36361c9e16220154e9d6f40b940f4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -212,22 +212,22 @@ enum phy_fia {
                            base.head)                                  \
                for_each_if((intel_plane)->pipe == (intel_crtc)->pipe)
 
-#define for_each_intel_crtc(dev, crtc) \
+#define for_each_intel_crtc(display, crtc) \
        list_for_each_entry((crtc), \
-                           &to_intel_display(dev)->pipe_list, \
+                           &(display)->pipe_list, \
                            pipe_head)
 
-#define for_each_intel_crtc_reverse(dev, crtc) \
+#define for_each_intel_crtc_reverse(display, crtc) \
        list_for_each_entry_reverse((crtc), \
-                                   &to_intel_display(dev)->pipe_list, \
+                                   &(display)->pipe_list, \
                                    pipe_head)
 
-#define for_each_intel_crtc_in_pipe_mask(dev, crtc, pipe_mask) \
-       for_each_intel_crtc((dev), (crtc)) \
+#define for_each_intel_crtc_in_pipe_mask(display, crtc, pipe_mask) \
+       for_each_intel_crtc((display), (crtc)) \
                for_each_if((pipe_mask) & BIT((crtc)->pipe))
 
-#define for_each_intel_crtc_in_pipe_mask_reverse(dev, crtc, pipe_mask) \
-       for_each_intel_crtc_reverse((dev), (crtc)) \
+#define for_each_intel_crtc_in_pipe_mask_reverse(display, crtc, pipe_mask) \
+       for_each_intel_crtc_reverse((display), (crtc)) \
                for_each_if((pipe_mask) & BIT((crtc)->pipe))
 
 #define for_each_intel_encoder(dev, intel_encoder)             \
@@ -288,28 +288,28 @@ enum phy_fia {
                for_each_if(plane)
 
 #define for_each_old_intel_crtc_in_state(__state, crtc, old_crtc_state, __i) \
-       for_each_intel_crtc((__state)->base.dev, (crtc)) \
+       for_each_intel_crtc(to_intel_display(__state), (crtc)) \
                for_each_if(((__i) = drm_crtc_index(&(crtc)->base), (void)(__i), \
                             (old_crtc_state) = intel_atomic_get_old_crtc_state((__state), (crtc))))
 
 #define for_each_new_intel_crtc_in_state(__state, crtc, new_crtc_state, __i) \
-       for_each_intel_crtc((__state)->base.dev, (crtc)) \
+       for_each_intel_crtc(to_intel_display(__state), (crtc)) \
                for_each_if(((__i) = drm_crtc_index(&(crtc)->base), (void)(__i), \
                             (new_crtc_state) = intel_atomic_get_new_crtc_state((__state), (crtc))))
 
 #define for_each_new_intel_crtc_in_state_reverse(__state, crtc, new_crtc_state, __i) \
-       for_each_intel_crtc_reverse((__state)->base.dev, (crtc)) \
+       for_each_intel_crtc_reverse(to_intel_display(__state), (crtc)) \
                for_each_if(((__i) = drm_crtc_index(&(crtc)->base), (void)(__i), \
                             (new_crtc_state) = intel_atomic_get_new_crtc_state((__state), (crtc))))
 
 #define for_each_oldnew_intel_crtc_in_state(__state, crtc, old_crtc_state, new_crtc_state, __i) \
-       for_each_intel_crtc((__state)->base.dev, (crtc)) \
+       for_each_intel_crtc(to_intel_display(__state), (crtc)) \
                for_each_if(((__i) = drm_crtc_index(&(crtc)->base), (void)(__i), \
                             (old_crtc_state) = intel_atomic_get_old_crtc_state((__state), (crtc)), \
                             (new_crtc_state) = intel_atomic_get_new_crtc_state((__state), (crtc))))
 
 #define for_each_oldnew_intel_crtc_in_state_reverse(__state, crtc, old_crtc_state, new_crtc_state, __i) \
-       for_each_intel_crtc_reverse((__state)->base.dev, (crtc)) \
+       for_each_intel_crtc_reverse(to_intel_display(__state), (crtc)) \
                for_each_if(((__i) = drm_crtc_index(&(crtc)->base), (void)(__i), \
                             (old_crtc_state) = intel_atomic_get_old_crtc_state((__state), (crtc)), \
                             (new_crtc_state) = intel_atomic_get_new_crtc_state((__state), (crtc))))

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 3d6f36773ad8a10605150435559f35d783dfd9f1..08004c1ba03f48f967cbbb0526cbccb3c29c892c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -612,7 +612,7 @@ static int i915_display_info(struct seq_file *m, void *unused)
 
        seq_printf(m, "CRTC info\n");
        seq_printf(m, "---------\n");
-       for_each_intel_crtc(display->drm, crtc)
+       for_each_intel_crtc(display, crtc)
                intel_crtc_info(m, crtc);
 
        seq_printf(m, "\n");
@@ -670,7 +670,7 @@ static int i915_ddb_info(struct seq_file *m, void *unused)
 
        seq_printf(m, "%-15s%8s%8s%8s\n", "", "Start", "End", "Size");
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                enum pipe pipe = crtc->pipe;
@@ -777,7 +777,7 @@ i915_fifo_underrun_reset_write(struct file *filp,
        if (!reset)
                return cnt;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct drm_crtc_commit *commit;
                struct intel_crtc_state *crtc_state;
 

diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 751e6b7d4a292eb1b02bdfe0189e38fec5fe75e0..f2f028bdd0aada79a0e91e7984c8fac4eab2fb7b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -1203,7 +1203,7 @@ static void assert_can_disable_lcpll(struct intel_display *display)
 {
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc)
+       for_each_intel_crtc(display, crtc)
                INTEL_DISPLAY_STATE_WARN(display, crtc->active,
                                         "CRTC for pipe %c enabled\n",
                                         pipe_name(crtc->pipe));

diff --git a/drivers/gpu/drm/i915/display/intel_display_trace.h b/drivers/gpu/drm/i915/display/intel_display_trace.h
index 27ebc32cb61a5c9b938a93155c3199f9745b8a74..504d105935bc06caba797a1e6a68b0b03ea7646c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_trace.h
+++ b/drivers/gpu/drm/i915/display/intel_display_trace.h
@@ -84,7 +84,7 @@ TRACE_EVENT(intel_pipe_enable,
                                  sizeof(__entry->frame[0]) * I915_MAX_PIPES);
                           memset(__entry->scanline, 0,
                                  sizeof(__entry->scanline[0]) * I915_MAX_PIPES);
-                          for_each_intel_crtc(display->drm, it__) {
+                          for_each_intel_crtc(display, it__) {
                                   __entry->frame[it__->pipe] = intel_crtc_get_vblank_counter(it__);
                                   __entry->scanline[it__->pipe] = intel_get_crtc_scanline(it__);
                           }
@@ -114,7 +114,7 @@ TRACE_EVENT(intel_pipe_disable,
                                  sizeof(__entry->frame[0]) * I915_MAX_PIPES);
                           memset(__entry->scanline, 0,
                                  sizeof(__entry->scanline[0]) * I915_MAX_PIPES);
-                          for_each_intel_crtc(display->drm, it__) {
+                          for_each_intel_crtc(display, it__) {
                                   __entry->frame[it__->pipe] = intel_crtc_get_vblank_counter(it__);
                                   __entry->scanline[it__->pipe] = intel_get_crtc_scanline(it__);
                           }
@@ -244,7 +244,7 @@ TRACE_EVENT(intel_memory_cxsr,
                                  sizeof(__entry->frame[0]) * I915_MAX_PIPES);
                           memset(__entry->scanline, 0,
                                  sizeof(__entry->scanline[0]) * I915_MAX_PIPES);
-                          for_each_intel_crtc(display->drm, crtc) {
+                          for_each_intel_crtc(display, crtc) {
                                   __entry->frame[crtc->pipe] = intel_crtc_get_vblank_counter(crtc);
                                   __entry->scanline[crtc->pipe] = intel_get_crtc_scanline(crtc);
                           }

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 3f9123a532447a243e56f6e6b14492782a2da82f..f76800db03f364a32aaeae3f563127d491d042d6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -6803,7 +6803,7 @@ static int intel_modeset_affected_transcoders(struct intel_atomic_state *state,
        if (transcoders == 0)
                return 0;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state;
                int ret;
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 8f73e01db17c94f72fcebed2986765f036a28fa2..be8febe3d234e699b0840cbedc3b2898ffe6639b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -837,7 +837,7 @@ static int intel_dp_mst_check_dsc_change(struct intel_atomic_state *state,
 
        mst_pipe_mask = get_pipes_downstream_of_mst_port(state, mst_mgr, NULL);
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, mst_pipe_mask) {
+       for_each_intel_crtc_in_pipe_mask(display, crtc, mst_pipe_mask) {
                struct intel_crtc_state *crtc_state =
                        intel_atomic_get_new_crtc_state(state, crtc);
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp_test.c b/drivers/gpu/drm/i915/display/intel_dp_test.c
index 5cfa1dd411dabf63af3b371d7f1adeeacc8208b2..ba44769c9cfbe36e4be66448537316602cffcdf2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_test.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_test.c
@@ -471,7 +471,7 @@ static int intel_dp_do_phy_test(struct intel_encoder *encoder,
        drm_dbg_kms(display->drm, "[ENCODER:%d:%s] PHY test\n",
                    encoder->base.base.id, encoder->base.name);
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, pipe_mask) {
+       for_each_intel_crtc_in_pipe_mask(display, crtc, pipe_mask) {
                const struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp_tunnel.c b/drivers/gpu/drm/i915/display/intel_dp_tunnel.c
index 11712a151f7290d9b8d2ec12eae35d0930597c50..10d47faa69963caa38836b524ca3662d8f274822 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_tunnel.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_tunnel.c
@@ -146,7 +146,7 @@ static int allocate_initial_tunnel_bw_for_pipes(struct intel_dp *intel_dp, u8 pi
        int tunnel_bw = 0;
        int err;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, pipe_mask) {
+       for_each_intel_crtc_in_pipe_mask(display, crtc, pipe_mask) {
                const struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                int stream_bw = intel_dp_config_required_rate(crtc_state);

diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index bb487e647f76792c8e61755cda574b98ca8e6a9b..0f933101b7dd16d82e782d0c9357dc03412ca067 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -4965,7 +4965,7 @@ static void readout_dpll_hw_state(struct intel_display *display,
                pll->wakeref = intel_display_power_get(display, pll->info->power_domain);
 
        pll->state.pipe_mask = 0;
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
 

diff --git a/drivers/gpu/drm/i915/display/intel_drrs.c b/drivers/gpu/drm/i915/display/intel_drrs.c
index 0fdb32ef241cde4920e687f1d50e1118c1890d85..6c95d4ae1ea908fcf034fee20f060a8509144077 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_drrs.c
+++ b/drivers/gpu/drm/i915/display/intel_drrs.c
@@ -137,7 +137,7 @@ static unsigned int intel_drrs_frontbuffer_bits(const struct intel_crtc_state *c
 
        frontbuffer_bits = INTEL_FRONTBUFFER_ALL_MASK(crtc->pipe);
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc,
+       for_each_intel_crtc_in_pipe_mask(display, crtc,
                                         crtc_state->joiner_pipes)
                frontbuffer_bits |= INTEL_FRONTBUFFER_ALL_MASK(crtc->pipe);
 
@@ -227,7 +227,7 @@ static void intel_drrs_frontbuffer_update(struct intel_display *display,
 {
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                unsigned int frontbuffer_bits;
 
                mutex_lock(&crtc->drrs.mutex);

diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index df1d3d9dc3e5b43a3266c3e5881e17bb91bd20d3..c8d4e3a5ce6b1b56908ce238a2b64f3d1503d5b5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -380,7 +380,7 @@ static bool intel_fbdev_init_bios(struct intel_display *display,
        unsigned int max_size = 0;
 
        /* Find the largest fb */
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                struct intel_plane *plane =
@@ -419,7 +419,7 @@ static bool intel_fbdev_init_bios(struct intel_display *display,
        }
 
        /* Now make sure all the pipes will fit into it */
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                struct intel_plane *plane =
@@ -489,7 +489,7 @@ static bool intel_fbdev_init_bios(struct intel_display *display,
        drm_framebuffer_get(&ifbdev->fb->base);
 
        /* Final pass to check if any active pipes don't have fbs */
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                struct intel_plane *plane =

diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
index 02013e89d8f2eb1fe42a2f452cd9a95a1f0f82b5..eca016d725d25aab66e9047d58eff46c3a7656d5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
+++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
@@ -527,7 +527,7 @@ void intel_check_cpu_fifo_underruns(struct intel_display *display)
 
        spin_lock_irq(&display->irq.lock);
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                if (crtc->cpu_fifo_underrun_disabled)
                        continue;
 
@@ -554,7 +554,7 @@ void intel_check_pch_fifo_underruns(struct intel_display *display)
 
        spin_lock_irq(&display->irq.lock);
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                if (crtc->pch_fifo_underrun_disabled)
                        continue;
 

diff --git a/drivers/gpu/drm/i915/display/intel_flipq.c b/drivers/gpu/drm/i915/display/intel_flipq.c
index 333d28faf4caa9b15a75964d3bd2f45d59051f18..bf278f60bba7804c23076d4514584241698c6be4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_flipq.c
+++ b/drivers/gpu/drm/i915/display/intel_flipq.c
@@ -132,7 +132,7 @@ void intel_flipq_init(struct intel_display *display)
 
        intel_dmc_wait_fw_load(display);
 
-       for_each_intel_crtc(display->drm, crtc)
+       for_each_intel_crtc(display, crtc)
                intel_flipq_crtc_init(crtc);
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_global_state.c b/drivers/gpu/drm/i915/display/intel_global_state.c
index 9e1369c834e49d868ddf5e5afb3059af30b09c31..886caf29c9ae81d0f85e2ed1b06f2b618159700e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_global_state.c
+++ b/drivers/gpu/drm/i915/display/intel_global_state.c
@@ -140,7 +140,7 @@ static void assert_global_state_write_locked(struct intel_display *display)
 {
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc)
+       for_each_intel_crtc(display, crtc)
                drm_modeset_lock_assert_held(&crtc->base.mutex);
 }
 
@@ -163,7 +163,7 @@ static void assert_global_state_read_locked(struct intel_atomic_state *state)
        struct drm_modeset_acquire_ctx *ctx = state->base.acquire_ctx;
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                if (modeset_lock_is_held(ctx, &crtc->base.mutex))
                        return;
        }
@@ -301,7 +301,7 @@ int intel_atomic_lock_global_state(struct intel_global_state *obj_state)
        struct intel_display *display = to_intel_display(state);
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                int ret;
 
                ret = drm_modeset_lock(&crtc->base.mutex,
@@ -334,7 +334,7 @@ intel_atomic_global_state_is_serialized(struct intel_atomic_state *state)
        struct intel_display *display = to_intel_display(state);
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc)
+       for_each_intel_crtc(display, crtc)
                if (!intel_atomic_get_new_crtc_state(state, crtc))
                        return false;
        return true;

diff --git a/drivers/gpu/drm/i915/display/intel_initial_plane.c b/drivers/gpu/drm/i915/display/intel_initial_plane.c
index 034fe199c2a156d9e7d0d388af6fba41dcf8f40f..6aa253678ec943de3521d205815194044655ed2f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_initial_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_initial_plane.c
@@ -50,7 +50,7 @@ intel_reuse_initial_plane_obj(struct intel_crtc *this,
        struct intel_display *display = to_intel_display(this);
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_plane *plane =
                        to_intel_plane(crtc->base.primary);
                const struct intel_plane_state *plane_state =
@@ -208,7 +208,7 @@ void intel_initial_plane_config(struct intel_display *display)
        struct intel_initial_plane_configs all_plane_configs = {};
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                struct intel_initial_plane_config *plane_config =

diff --git a/drivers/gpu/drm/i915/display/intel_link_bw.c b/drivers/gpu/drm/i915/display/intel_link_bw.c
index d2862de894fa7f778bff12a755d7227d5ec99b38..b47474a3e9fec5032e20c4ab4cc57759229e9794 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_link_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_link_bw.c
@@ -108,7 +108,7 @@ static int __intel_link_bw_reduce_bpp(struct intel_atomic_state *state,
        struct intel_crtc *crtc;
        int max_bpp_x16 = 0;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, pipe_mask) {
+       for_each_intel_crtc_in_pipe_mask(display, crtc, pipe_mask) {
                struct intel_crtc_state *crtc_state;
                int link_bpp_x16;
 

diff --git a/drivers/gpu/drm/i915/display/intel_load_detect.c b/drivers/gpu/drm/i915/display/intel_load_detect.c
index 2f767b15a7f9ba07aec1dd83fd1da1f011de82a5..3fef1ebc635702127353eae7afe6a6a4172a01d8 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_load_detect.c
+++ b/drivers/gpu/drm/i915/display/intel_load_detect.c
@@ -89,7 +89,7 @@ intel_load_detect_get_pipe(struct drm_connector *connector,
        }
 
        /* Find an unused one (if possible) */
-       for_each_intel_crtc(display->drm, possible_crtc) {
+       for_each_intel_crtc(display, possible_crtc) {
                if (!(encoder->base.possible_crtcs &
                      drm_crtc_mask(&possible_crtc->base)))
                        continue;

diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
index 0c9775eabdf02a53672a2796430a82782c30a497..6a7982551929dbfc58f88dab0df9f98ff0f2a09e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
+++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
@@ -71,7 +71,7 @@ static void intel_crtc_disable_noatomic_begin(struct intel_crtc *crtc,
        to_intel_atomic_state(state)->internal = true;
 
        /* Everything's already locked, -EDEADLK can't happen. */
-       for_each_intel_crtc_in_pipe_mask(display->drm, temp_crtc,
+       for_each_intel_crtc_in_pipe_mask(display, temp_crtc,
                                         BIT(pipe) |
                                         intel_crtc_joiner_secondary_pipes(crtc_state)) {
                struct intel_crtc_state *temp_crtc_state =
@@ -192,7 +192,7 @@ static u8 get_transcoder_pipes(struct intel_display *display,
        struct intel_crtc *temp_crtc;
        u8 pipes = 0;
 
-       for_each_intel_crtc(display->drm, temp_crtc) {
+       for_each_intel_crtc(display, temp_crtc) {
                struct intel_crtc_state *temp_crtc_state =
                        to_intel_crtc_state(temp_crtc->base.state);
 
@@ -248,7 +248,7 @@ static u8 get_joiner_secondary_pipes(struct intel_display *display, u8 primary_p
        struct intel_crtc *primary_crtc;
        u8 pipes = 0;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, primary_crtc, primary_pipes_mask) {
+       for_each_intel_crtc_in_pipe_mask(display, primary_crtc, primary_pipes_mask) {
                struct intel_crtc_state *primary_crtc_state =
                        to_intel_crtc_state(primary_crtc->base.state);
 
@@ -278,16 +278,16 @@ static void intel_crtc_disable_noatomic(struct intel_crtc *crtc,
                    portsync_master_mask & joiner_secondaries_mask ||
                    portsync_slaves_mask & joiner_secondaries_mask);
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, temp_crtc, joiner_secondaries_mask)
+       for_each_intel_crtc_in_pipe_mask(display, temp_crtc, joiner_secondaries_mask)
                intel_crtc_disable_noatomic_begin(temp_crtc, ctx);
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, temp_crtc, portsync_slaves_mask)
+       for_each_intel_crtc_in_pipe_mask(display, temp_crtc, portsync_slaves_mask)
                intel_crtc_disable_noatomic_begin(temp_crtc, ctx);
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, temp_crtc, portsync_master_mask)
+       for_each_intel_crtc_in_pipe_mask(display, temp_crtc, portsync_master_mask)
                intel_crtc_disable_noatomic_begin(temp_crtc, ctx);
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, temp_crtc,
+       for_each_intel_crtc_in_pipe_mask(display, temp_crtc,
                                         joiner_secondaries_mask |
                                         portsync_slaves_mask |
                                         portsync_master_mask)
@@ -378,7 +378,7 @@ intel_sanitize_plane_mapping(struct intel_display *display)
        if (DISPLAY_VER(display) >= 4)
                return;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_plane *plane =
                        to_intel_plane(crtc->base.primary);
                struct intel_crtc *plane_crtc;
@@ -534,7 +534,7 @@ static void intel_sanitize_all_crtcs(struct intel_display *display,
        for (;;) {
                u32 old_mask = crtcs_forced_off;
 
-               for_each_intel_crtc(display->drm, crtc) {
+               for_each_intel_crtc(display, crtc) {
                        u32 crtc_mask = drm_crtc_mask(&crtc->base);
 
                        if (crtcs_forced_off & crtc_mask)
@@ -547,7 +547,7 @@ static void intel_sanitize_all_crtcs(struct intel_display *display,
                        break;
        }
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
 
@@ -683,7 +683,7 @@ static void readout_plane_state(struct intel_display *display)
                            str_enabled_disabled(visible), pipe_name(pipe));
        }
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
 
@@ -701,7 +701,7 @@ static void intel_modeset_readout_hw_state(struct intel_display *display)
        struct intel_connector *connector;
        struct drm_connector_list_iter conn_iter;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
 
@@ -743,7 +743,7 @@ static void intel_modeset_readout_hw_state(struct intel_display *display)
                                /* encoder should read be linked to joiner primary */
                                WARN_ON(intel_crtc_is_joiner_secondary(crtc_state));
 
-                               for_each_intel_crtc_in_pipe_mask(display->drm, secondary_crtc,
+                               for_each_intel_crtc_in_pipe_mask(display, secondary_crtc,
                                                                 intel_crtc_joiner_secondary_pipes(crtc_state)) {
                                        struct intel_crtc_state *secondary_crtc_state;
 
@@ -816,7 +816,7 @@ static void intel_modeset_readout_hw_state(struct intel_display *display)
        }
        drm_connector_list_iter_end(&conn_iter);
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                struct intel_plane *plane;
@@ -963,7 +963,7 @@ void intel_modeset_setup_hw_state(struct intel_display *display,
         * intel_sanitize_plane_mapping() may need to do vblank
         * waits, so we need vblank interrupts restored beforehand.
         */
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
 
@@ -999,7 +999,7 @@ void intel_modeset_setup_hw_state(struct intel_display *display,
                intel_wm_get_hw_state(display);
        intel_wm_sanitize(display);
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                struct intel_power_domain_mask put_domains;

diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
index 911ae261d1b53bc56d181faf06ea91703a8fbcd3..e191a57f02cdbe6d64f2ca05a696ca39af8678bb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -1812,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(display->drm, crtc, joined_pipes) {
+               for_each_intel_crtc_in_pipe_mask(display, crtc, joined_pipes) {
                        int ret;
 
                        ret = intel_crtc_add_planes_to_state(state, crtc, affected_planes);

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 9382ad1e01d82179a1ee1b8d800f8f239273b176..5047e3fdc9ff071d70719bb522d737718eea93c7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1908,7 +1908,7 @@ void intel_psr_set_non_psr_pipes(struct intel_dp *intel_dp,
                return;
 
        /* We ignore possible secondary PSR/Panel Replay capable eDP */
-       for_each_intel_crtc(display->drm, crtc)
+       for_each_intel_crtc(display, crtc)
                active_pipes |= crtc->active ? BIT(crtc->pipe) : 0;
 
        active_pipes = intel_calc_active_pipes(state, active_pipes);

diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index 2880f2aa424379d97f2641ab60d25ba7f561feb5..f2d86b29c4154d9d298ba4b097fb2e838e2cf99c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -1779,7 +1779,7 @@ static int reset_link_commit(struct intel_tc_port *tc,
        if (!pipe_mask)
                return 0;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, pipe_mask) {
+       for_each_intel_crtc_in_pipe_mask(display, crtc, pipe_mask) {
                struct intel_crtc_state *crtc_state;
 
                crtc_state = intel_atomic_get_crtc_state(&state->base, crtc);

diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 96d2dcbe7bbcf629ca5ccf0d0a83b6fbd3d2393c..346e97d91d928f4a32fae5e772c732406d0dd88b 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -2529,7 +2529,7 @@ skl_compute_ddb(struct intel_atomic_state *state)
                }
        }
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                enum pipe pipe = crtc->pipe;
 
                new_dbuf_state->slices[pipe] =
@@ -2574,7 +2574,7 @@ skl_compute_ddb(struct intel_atomic_state *state)
                        return ret;
        }
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                ret = skl_crtc_allocate_ddb(state, crtc);
                if (ret)
                        return ret;
@@ -2845,7 +2845,7 @@ static int pkgc_max_linetime(struct intel_atomic_state *state)
        }
 
        max_linetime = 0;
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                if (display->pkgc.disable[crtc->pipe])
                        return 0;
 
@@ -3033,7 +3033,7 @@ static void skl_wm_get_hw_state(struct intel_display *display)
        dbuf_state->mdclk_cdclk_ratio = intel_mdclk_cdclk_ratio(display, &display->cdclk.hw);
        dbuf_state->active_pipes = 0;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                enum pipe pipe = crtc->pipe;
@@ -3446,7 +3446,7 @@ static void pipe_mbus_dbox_ctl_update(struct intel_display *display,
 {
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc_in_pipe_mask(display->drm, crtc, dbuf_state->active_pipes)
+       for_each_intel_crtc_in_pipe_mask(display, crtc, dbuf_state->active_pipes)
                intel_de_write(display, PIPE_MBUS_DBOX_CTL(crtc->pipe),
                               pipe_mbus_dbox_ctl(crtc, dbuf_state));
 }
@@ -3758,14 +3758,14 @@ static bool skl_dbuf_is_misconfigured(struct intel_display *display)
        struct skl_ddb_entry entries[I915_MAX_PIPES] = {};
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
 
                entries[crtc->pipe] = crtc_state->wm.skl.ddb;
        }
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                const struct intel_crtc_state *crtc_state =
                        to_intel_crtc_state(crtc->base.state);
                u8 slices;
@@ -3803,7 +3803,7 @@ static void skl_dbuf_sanitize(struct intel_display *display)
 
        drm_dbg_kms(display->drm, "BIOS has misprogrammed the DBUF, disabling all planes\n");
 
-       for_each_intel_crtc(display->drm, crtc) {
+       for_each_intel_crtc(display, crtc) {
                struct intel_plane *plane = to_intel_plane(crtc->base.primary);
                const struct intel_plane_state *plane_state =
                        to_intel_plane_state(plane->base.state);