Commit 3e5e0a75 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915/intel_fb: Pull is_surface_linear() from intel_display.c/skl_universal_plane.c 



Move is_surface_linear() to intel_fb.c and export it from here, also
removing the duplicate definitions of it.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210325214808.2071517-9-imre.deak@intel.com
parent 5e4eb4e6

drivers/gpu/drm/i915/display/intel_display.c

+0 −6
Original line number Diff line number Diff line
@@ -1264,12 +1264,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,

drivers/gpu/drm/i915/display/intel_fb.c

+6 −0
Original line number Diff line number Diff line
@@ -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) ||

drivers/gpu/drm/i915/display/intel_fb.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/display/skl_universal_plane.c

+0 −6
Original line number Diff line number Diff line
@@ -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)

{