On Thu, Mar 11, 2021 at 12:17:22AM +0200, Imre Deak wrote:
> Move is_surface_linear() to intel_fb.c and export it from here, also
> removing the duplicate definitions of it.
>
> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 6 ------
> drivers/gpu/drm/i915/display/intel_fb.c | 6 ++++++
> drivers/gpu/drm/i915/display/intel_fb.h | 2 ++
> drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ------
> 4 files changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 39584a82550d..deaf7ddadff1 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -1262,12 +1262,6 @@ static u32 intel_adjust_tile_offset(int *x, int *y,
> return new_offset;
> }
>
> -static bool is_surface_linear(const struct drm_framebuffer *fb, int color_plane)
> -{
> - return fb->modifier == DRM_FORMAT_MOD_LINEAR ||
> - is_gen12_ccs_plane(fb, color_plane);
> -}
> -
> static u32 intel_adjust_aligned_offset(int *x, int *y,
> const struct drm_framebuffer *fb,
> int color_plane,
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index 977ee2acaed1..74157d5f2d7f 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -27,6 +27,12 @@ bool is_gen12_ccs_cc_plane(const struct drm_framebuffer *fb, int plane)
> plane == 2;
> }
>
> +bool is_surface_linear(const struct drm_framebuffer *fb, int color_plane)
> +{
> + return fb->modifier == DRM_FORMAT_MOD_LINEAR ||
> + is_gen12_ccs_plane(fb, color_plane);
> +}
> +
> int main_to_ccs_plane(const struct drm_framebuffer *fb, int main_plane)
> {
> drm_WARN_ON(fb->dev, !is_ccs_modifier(fb->modifier) ||
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
> index 3cde53c75cb3..6ea220438f9a 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.h
> +++ b/drivers/gpu/drm/i915/display/intel_fb.h
> @@ -14,6 +14,8 @@ bool is_ccs_plane(const struct drm_framebuffer *fb, int plane);
> bool is_gen12_ccs_plane(const struct drm_framebuffer *fb, int plane);
> bool is_gen12_ccs_cc_plane(const struct drm_framebuffer *fb, int plane);
>
> +bool is_surface_linear(const struct drm_framebuffer *fb, int color_plane);
> +
> int main_to_ccs_plane(const struct drm_framebuffer *fb, int main_plane);
> int skl_ccs_to_main_plane(const struct drm_framebuffer *fb, int ccs_plane);
> int skl_main_to_aux_plane(const struct drm_framebuffer *fb, int main_plane);
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 9a456b3d19a9..2f1a7b88f66a 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -562,12 +562,6 @@ icl_program_input_csc(struct intel_plane *plane,
> PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 2), 0x0);
> }
>
> -static bool is_surface_linear(const struct drm_framebuffer *fb, int color_plane)
> -{
> - return fb->modifier == DRM_FORMAT_MOD_LINEAR ||
> - is_gen12_ccs_plane(fb, color_plane);
> -}
> -
> static unsigned int skl_plane_stride_mult(const struct drm_framebuffer *fb,
> int color_plane, unsigned int rotation)
> {
> --
> 2.25.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
