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

Commit 8a7db647 authored by Kieran Bingham's avatar Kieran Bingham Committed by Mauro Carvalho Chehab
Browse files

media: vsp1: Remove artificial minimum width/height limitation 



The VSP1 has a minimum width and height of a single pixel, with the
exception of pixel formats with sub-sampling.

Remove the artificial minimum width and minimum height limitation, and
instead clamp the minimum dimensions based upon the sub-sampling
parameter of that dimension.

Signed-off-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 9b2798d5

drivers/media/platform/vsp1/vsp1_video.c

+2 −5
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ 
#define VSP1_VIDEO_DEF_WIDTH		1024

#define VSP1_VIDEO_DEF_HEIGHT		768



#define VSP1_VIDEO_MIN_WIDTH		2U

#define VSP1_VIDEO_MAX_WIDTH		8190U

#define VSP1_VIDEO_MIN_HEIGHT		2U

#define VSP1_VIDEO_MAX_HEIGHT		8190U



/* -----------------------------------------------------------------------------
@@ -136,9 +134,8 @@ static int __vsp1_video_try_format(struct vsp1_video *video, 
	height = round_down(height, info->vsub);



	/* Clamp the width and height. */

	pix->width = clamp(width, VSP1_VIDEO_MIN_WIDTH, VSP1_VIDEO_MAX_WIDTH);

	pix->height = clamp(height, VSP1_VIDEO_MIN_HEIGHT,

			    VSP1_VIDEO_MAX_HEIGHT);

	pix->width = clamp(width, info->hsub, VSP1_VIDEO_MAX_WIDTH);

	pix->height = clamp(height, info->vsub, VSP1_VIDEO_MAX_HEIGHT);



	/*

	 * Compute and clamp the stride and image size. While not documented in