Replace struct drm_i915_private with struct intel_display in the helper intel_joiner_supported_pipes and its callers.
Signed-off-by: Ankit Nautiyal <[email protected]> --- drivers/gpu/drm/i915/display/intel_display.c | 6 ++++-- drivers/gpu/drm/i915/display/intel_joiner.c | 10 +++++----- drivers/gpu/drm/i915/display/intel_joiner.h | 3 +-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 22a65d66f45e..a326db662748 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5776,6 +5776,7 @@ static bool intel_pipes_need_modeset(struct intel_atomic_state *state, static int intel_atomic_check_joiner(struct intel_atomic_state *state, struct intel_crtc *primary_crtc) { + struct intel_display *display = to_intel_display(primary_crtc); struct drm_i915_private *i915 = to_i915(state->base.dev); struct intel_crtc_state *primary_crtc_state = intel_atomic_get_new_crtc_state(state, primary_crtc); @@ -5789,12 +5790,13 @@ static int intel_atomic_check_joiner(struct intel_atomic_state *state, primary_crtc->pipe != intel_joiner_get_primary_pipe(primary_crtc_state))) return -EINVAL; - if (primary_crtc_state->joiner_pipes & ~intel_joiner_supported_pipes(i915)) { + if (primary_crtc_state->joiner_pipes & ~intel_joiner_supported_pipes(display)) { drm_dbg_kms(&i915->drm, "[CRTC:%d:%s] Cannot act as joiner primary " "(need 0x%x as pipes, only 0x%x possible)\n", primary_crtc->base.base.id, primary_crtc->base.name, - primary_crtc_state->joiner_pipes, intel_joiner_supported_pipes(i915)); + primary_crtc_state->joiner_pipes, + intel_joiner_supported_pipes(display)); return -EINVAL; } diff --git a/drivers/gpu/drm/i915/display/intel_joiner.c b/drivers/gpu/drm/i915/display/intel_joiner.c index 2c7477914f74..32cd0ab4e707 100644 --- a/drivers/gpu/drm/i915/display/intel_joiner.c +++ b/drivers/gpu/drm/i915/display/intel_joiner.c @@ -72,18 +72,18 @@ void intel_joiner_adjust_pipe_src(struct intel_crtc_state *crtc_state) (pipe - primary_pipe) * width, 0); } -u8 intel_joiner_supported_pipes(struct drm_i915_private *i915) +u8 intel_joiner_supported_pipes(struct intel_display *display) { u8 pipes; - if (DISPLAY_VER(i915) >= 12) + if (DISPLAY_VER(display) >= 12) pipes = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D); - else if (DISPLAY_VER(i915) >= 11) + else if (DISPLAY_VER(display) >= 11) pipes = BIT(PIPE_B) | BIT(PIPE_C); else pipes = 0; - return pipes & DISPLAY_RUNTIME_INFO(i915)->pipe_mask; + return pipes & DISPLAY_RUNTIME_INFO(display)->pipe_mask; } void intel_joiner_enabled_pipes(struct intel_display *display, @@ -96,7 +96,7 @@ void intel_joiner_enabled_pipes(struct intel_display *display, *secondary_pipes = 0; for_each_intel_crtc_in_pipe_mask(&i915->drm, crtc, - intel_joiner_supported_pipes(i915)) { + intel_joiner_supported_pipes(display)) { intel_dss_get_compressed_joiner_pipes(crtc, primary_pipes, secondary_pipes); diff --git a/drivers/gpu/drm/i915/display/intel_joiner.h b/drivers/gpu/drm/i915/display/intel_joiner.h index 49cb2d78f4c8..698f8e55f8ea 100644 --- a/drivers/gpu/drm/i915/display/intel_joiner.h +++ b/drivers/gpu/drm/i915/display/intel_joiner.h @@ -10,7 +10,6 @@ enum pipe; struct drm_display_mode; -struct drm_i915_private; struct intel_atomic_state; struct intel_crtc_state; struct intel_display; @@ -21,7 +20,7 @@ void intel_joiner_adjust_timings(const struct intel_crtc_state *crtc_state, struct drm_display_mode *mode); void intel_joiner_compute_pipe_src(struct intel_crtc_state *crtc_state); void intel_joiner_adjust_pipe_src(struct intel_crtc_state *crtc_state); -u8 intel_joiner_supported_pipes(struct drm_i915_private *i915); +u8 intel_joiner_supported_pipes(struct intel_display *display); void intel_joiner_enabled_pipes(struct intel_display *display, u8 *primary_pipes, u8 *secondary_pipes); enum pipe intel_joiner_find_primary_pipe(enum pipe pipe, u8 primary_pipes, u8 secondary_pipes); -- 2.45.2
