drm/i915/display: always pass display->drm to for_each_intel_crtc*()

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.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/447a5b2309e213abb849601727d45b406d440c88.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 33d8f6b6afeaff0921b233ff8d5ccb4b82391c8f..4cd07410ad72cc197a1bc5f3a6edd24105b82189 100644 (file)
--- 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 fa05be282cbf4814068e71512dbc570d3999a0e0..d741e2f7105f325ec28ca47dab63642beace701d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5702,6 +5702,7 @@ out:
  */
 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;
@@ -5729,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(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 a1f9558d53af22dd6b1f3f31994ddba4109c203a..911ae261d1b53bc56d181faf06ea91703a8fbcd3 100644 (file)
--- 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);