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

Commit 8bed5cc7 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Dave Airlie
Browse files

drm/rcar-du: Fix maximum frame buffer pitch computation 



The maximum pitch constraint for the hardware is expressed in pixels.
Convert it to bytes to validate frame buffer creation, as frame buffer
pitches are expressed in bytes.

Reported-by: default avatarPhil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e05444be

drivers/gpu/drm/rcar-du/rcar_du_kms.c

+11 −2
Original line number Diff line number Diff line
@@ -135,7 +135,9 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv, 
{

	struct rcar_du_device *rcdu = dev->dev_private;

	const struct rcar_du_format_info *format;

	unsigned int max_pitch;

	unsigned int align;

	unsigned int bpp;



	format = rcar_du_format_info(mode_cmd->pixel_format);

	if (format == NULL) {
@@ -144,13 +146,20 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv, 
		return ERR_PTR(-EINVAL);

	}



	/*

	 * The pitch and alignment constraints are expressed in pixels on the

	 * hardware side and in bytes in the DRM API.

	 */

	bpp = format->planes == 2 ? 1 : format->bpp / 8;

	max_pitch =  4096 * bpp;



	if (rcar_du_needs(rcdu, RCAR_DU_QUIRK_ALIGN_128B))

		align = 128;

	else

		align = 16 * format->bpp / 8;

		align = 16 * bpp;



	if (mode_cmd->pitches[0] & (align - 1) ||

	    mode_cmd->pitches[0] >= 8192) {

	    mode_cmd->pitches[0] >= max_pitch) {

		dev_dbg(dev->dev, "invalid pitch value %u\n",

			mode_cmd->pitches[0]);

		return ERR_PTR(-EINVAL);