On Thu, 13 Feb 2025, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Relocate intel_plane_uses_fence() into intel_fb.c. Not sure
> that's the best place, but since this is mostly about the
> fb and vma I can't think of anything truly better right now.
Better than intel_display.c anyway.
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 10 ----------
> drivers/gpu/drm/i915/display/intel_display.h | 2 --
> drivers/gpu/drm/i915/display/intel_fb.c | 10 ++++++++++
> drivers/gpu/drm/i915/display/intel_fb.h | 1 +
> 4 files changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index c2bde539a4ff..4800fefd6321 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -637,16 +637,6 @@ unsigned int intel_remapped_info_size(const struct intel_remapped_info *rem_info
> return size;
> }
>
> -bool intel_plane_uses_fence(const struct intel_plane_state *plane_state)
> -{
> - struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
> - struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
> -
> - return DISPLAY_VER(dev_priv) < 4 ||
> - (plane->fbc && !plane_state->no_fbc_reason &&
> - plane_state->view.gtt.type == I915_GTT_VIEW_NORMAL);
> -}
> -
> /*
> * Convert the x/y offsets into a linear offset.
> * Only valid with 0/180 degree rotation, which is fine since linear
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index b3cdf7f04450..d3afd134f70e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -526,8 +526,6 @@ void ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state);
> int bdw_get_pipe_misc_bpp(struct intel_crtc *crtc);
> unsigned int intel_plane_fence_y_offset(const struct intel_plane_state *plane_state);
>
> -bool intel_plane_uses_fence(const struct intel_plane_state *plane_state);
> -
> struct intel_encoder *
> intel_get_crtc_new_encoder(const struct intel_atomic_state *state,
> const struct intel_crtc_state *crtc_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index 5af93235057c..5875af2b61e6 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -1283,6 +1283,16 @@ bool intel_fb_needs_pot_stride_remap(const struct intel_framebuffer *fb)
> intel_fb_uses_dpt(&fb->base);
> }
>
> +bool intel_plane_uses_fence(const struct intel_plane_state *plane_state)
> +{
> + struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
> + struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
> +
> + return DISPLAY_VER(dev_priv) < 4 ||
> + (plane->fbc && !plane_state->no_fbc_reason &&
> + plane_state->view.gtt.type == I915_GTT_VIEW_NORMAL);
> +}
> +
> static int intel_fb_pitch(const struct intel_framebuffer *fb, int color_plane, unsigned int rotation)
> {
> if (drm_rotation_90_or_270(rotation))
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
> index e6ef1783e351..63728520eb06 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.h
> +++ b/drivers/gpu/drm/i915/display/intel_fb.h
> @@ -77,6 +77,7 @@ u32 intel_plane_compute_aligned_offset(int *x, int *y,
> int color_plane);
>
> bool intel_fb_needs_pot_stride_remap(const struct intel_framebuffer *fb);
> +bool intel_plane_uses_fence(const struct intel_plane_state *plane_state);
> bool intel_fb_supports_90_270_rotation(const struct intel_framebuffer *fb);
>
> int intel_fill_fb_info(struct intel_display *display, struct intel_framebuffer *fb);
--
Jani Nikula, Intel
