Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dd4677c authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm: Extract __setplane_check() 



Pull all the error checking out from __set_plane_internal() to a helper
function. We'll have another user of this soon.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180628135457.14647-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 82e00d11

drivers/gpu/drm/drm_plane.c

+49 −31
Original line number Diff line number Diff line
@@ -583,44 +583,20 @@ int drm_plane_check_pixel_format(struct drm_plane *plane, 
	return 0;

}



/*

 * __setplane_internal - setplane handler for internal callers

 *

 * This function will take a reference on the new fb for the plane

 * on success.

 *

 * src_{x,y,w,h} are provided in 16.16 fixed point format

 */

static int __setplane_internal(struct drm_plane *plane,

static int __setplane_check(struct drm_plane *plane,

			    struct drm_crtc *crtc,

			    struct drm_framebuffer *fb,

			    int32_t crtc_x, int32_t crtc_y,

			    uint32_t crtc_w, uint32_t crtc_h,

			       /* src_{x,y,w,h} values are 16.16 fixed point */

			    uint32_t src_x, uint32_t src_y,

			       uint32_t src_w, uint32_t src_h,

			       struct drm_modeset_acquire_ctx *ctx)

			    uint32_t src_w, uint32_t src_h)

{

	int ret = 0;



	/* No fb means shut it down */

	if (!fb) {

		plane->old_fb = plane->fb;

		ret = plane->funcs->disable_plane(plane, ctx);

		if (!ret) {

			plane->crtc = NULL;

			plane->fb = NULL;

		} else {

			plane->old_fb = NULL;

		}

		goto out;

	}

	int ret;



	/* Check whether this plane is usable on this CRTC */

	if (!(plane->possible_crtcs & drm_crtc_mask(crtc))) {

		DRM_DEBUG_KMS("Invalid crtc for plane\n");

		ret = -EINVAL;

		goto out;

		return -EINVAL;

	}



	/* Check whether this plane supports the fb pixel format. */
@@ -628,11 +604,12 @@ static int __setplane_internal(struct drm_plane *plane, 
					   fb->modifier);

	if (ret) {

		struct drm_format_name_buf format_name;



		DRM_DEBUG_KMS("Invalid pixel format %s, modifier 0x%llx\n",

			      drm_get_format_name(fb->format->format,

						  &format_name),

			      fb->modifier);

		goto out;

		return ret;

	}



	/* Give drivers some help against integer overflows */
@@ -642,11 +619,52 @@ static int __setplane_internal(struct drm_plane *plane, 
	    crtc_y > INT_MAX - (int32_t) crtc_h) {

		DRM_DEBUG_KMS("Invalid CRTC coordinates %ux%u+%d+%d\n",

			      crtc_w, crtc_h, crtc_x, crtc_y);

		ret = -ERANGE;

		goto out;

		return -ERANGE;

	}



	ret = drm_framebuffer_check_src_coords(src_x, src_y, src_w, src_h, fb);

	if (ret)

		return ret;



	return 0;

}



/*

 * __setplane_internal - setplane handler for internal callers

 *

 * This function will take a reference on the new fb for the plane

 * on success.

 *

 * src_{x,y,w,h} are provided in 16.16 fixed point format

 */

static int __setplane_internal(struct drm_plane *plane,

			       struct drm_crtc *crtc,

			       struct drm_framebuffer *fb,

			       int32_t crtc_x, int32_t crtc_y,

			       uint32_t crtc_w, uint32_t crtc_h,

			       /* src_{x,y,w,h} values are 16.16 fixed point */

			       uint32_t src_x, uint32_t src_y,

			       uint32_t src_w, uint32_t src_h,

			       struct drm_modeset_acquire_ctx *ctx)

{

	int ret = 0;



	/* No fb means shut it down */

	if (!fb) {

		plane->old_fb = plane->fb;

		ret = plane->funcs->disable_plane(plane, ctx);

		if (!ret) {

			plane->crtc = NULL;

			plane->fb = NULL;

		} else {

			plane->old_fb = NULL;

		}

		goto out;

	}



	ret = __setplane_check(plane, crtc, fb,

			       crtc_x, crtc_y, crtc_w, crtc_h,

			       src_x, src_y, src_w, src_h);

	if (ret)

		goto out;