Commit d7bdd1c8 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915/intel_fb: Pull FB plane functions from intel_sprite.c 



Move the FB plane specific function from intel_sprite.c to intel_fb.c

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-10-imre.deak@intel.com
parent 3e5e0a75

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

+32 −0
Original line number Original line Diff line number Diff line
@@ -64,3 +64,35 @@ int skl_main_to_aux_plane(const struct drm_framebuffer *fb, int main_plane) 
	else

	else

		return 0;

		return 0;

}

}



int intel_plane_check_stride(const struct intel_plane_state *plane_state)

{

	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);

	const struct drm_framebuffer *fb = plane_state->hw.fb;

	unsigned int rotation = plane_state->hw.rotation;

	u32 stride, max_stride;



	/*

	 * We ignore stride for all invisible planes that

	 * can be remapped. Otherwise we could end up

	 * with a false positive when the remapping didn't

	 * kick in due the plane being invisible.

	 */

	if (intel_plane_can_remap(plane_state) &&

	    !plane_state->uapi.visible)

		return 0;



	/* FIXME other color planes? */

	stride = plane_state->color_plane[0].stride;

	max_stride = plane->max_stride(plane, fb->format->format,

				       fb->modifier, rotation);



	if (stride > max_stride) {

		DRM_DEBUG_KMS("[FB:%d] stride (%d) exceeds [PLANE:%d:%s] max stride (%d)\n",

			      fb->base.id, stride,

			      plane->base.base.id, plane->base.name, max_stride);

		return -EINVAL;

	}



	return 0;

}

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,8 @@ 




struct drm_framebuffer;

struct drm_framebuffer;





struct intel_plane_state;



bool is_ccs_plane(const struct drm_framebuffer *fb, int plane);

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_plane(const struct drm_framebuffer *fb, int plane);

bool is_gen12_ccs_cc_plane(const struct drm_framebuffer *fb, int plane);

bool is_gen12_ccs_cc_plane(const struct drm_framebuffer *fb, int plane);
@@ -20,4 +22,6 @@ 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_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);

int skl_main_to_aux_plane(const struct drm_framebuffer *fb, int main_plane);





int intel_plane_check_stride(const struct intel_plane_state *plane_state);



#endif /* __INTEL_FB_H__ */
 
#endif /* __INTEL_FB_H__ */

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

+0 −32
Original line number Original line Diff line number Diff line
@@ -49,38 +49,6 @@ 
#include "i9xx_plane.h"

#include "i9xx_plane.h"

#include "intel_vrr.h"

#include "intel_vrr.h"





int intel_plane_check_stride(const struct intel_plane_state *plane_state)

{

	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);

	const struct drm_framebuffer *fb = plane_state->hw.fb;

	unsigned int rotation = plane_state->hw.rotation;

	u32 stride, max_stride;



	/*

	 * We ignore stride for all invisible planes that

	 * can be remapped. Otherwise we could end up

	 * with a false positive when the remapping didn't

	 * kick in due the plane being invisible.

	 */

	if (intel_plane_can_remap(plane_state) &&

	    !plane_state->uapi.visible)

		return 0;



	/* FIXME other color planes? */

	stride = plane_state->color_plane[0].stride;

	max_stride = plane->max_stride(plane, fb->format->format,

				       fb->modifier, rotation);



	if (stride > max_stride) {

		DRM_DEBUG_KMS("[FB:%d] stride (%d) exceeds [PLANE:%d:%s] max stride (%d)\n",

			      fb->base.id, stride,

			      plane->base.base.id, plane->base.name, max_stride);

		return -EINVAL;

	}



	return 0;

}



int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)

int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)

{

{

	const struct drm_framebuffer *fb = plane_state->hw.fb;

	const struct drm_framebuffer *fb = plane_state->hw.fb;

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data, 
				    struct drm_file *file_priv);

				    struct drm_file *file_priv);

void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state);

void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state);

void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state);

void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state);

int intel_plane_check_stride(const struct intel_plane_state *plane_state);

int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state);

int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state);

int chv_plane_check_rotation(const struct intel_plane_state *plane_state);

int chv_plane_check_rotation(const struct intel_plane_state *plane_state);