Commit b369132f authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: ipu3-cio2: Rename CIO2_IMAGE_MAX_LENGTH as CIO2_IMAGE_MAX_HEIGHT 



CIO2_IMAGE_MAX_LENGTH is the maximum height of the image. Rename it as
"CIO2_IMAGE_MAX_HEIGHT" in order to better describe what it is.

Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 40f072e1

drivers/media/pci/intel/ipu3/ipu3-cio2.c

+3 −3
Original line number Diff line number Diff line
@@ -1094,8 +1094,8 @@ static int cio2_v4l2_try_fmt(struct file *file, void *fh, struct v4l2_format *f) 
	/* Only supports up to 4224x3136 */

	if (mpix->width > CIO2_IMAGE_MAX_WIDTH)

		mpix->width = CIO2_IMAGE_MAX_WIDTH;

	if (mpix->height > CIO2_IMAGE_MAX_LENGTH)

		mpix->height = CIO2_IMAGE_MAX_LENGTH;

	if (mpix->height > CIO2_IMAGE_MAX_HEIGHT)

		mpix->height = CIO2_IMAGE_MAX_HEIGHT;



	mpix->num_planes = 1;

	mpix->pixelformat = fmt->fourcc;
@@ -1283,7 +1283,7 @@ static int cio2_subdev_set_fmt(struct v4l2_subdev *sd, 
	}



	fmt->format.width = min(fmt->format.width, CIO2_IMAGE_MAX_WIDTH);

	fmt->format.height = min(fmt->format.height, CIO2_IMAGE_MAX_LENGTH);

	fmt->format.height = min(fmt->format.height, CIO2_IMAGE_MAX_HEIGHT);

	fmt->format.field = V4L2_FIELD_NONE;



	mutex_lock(&q->subdev_lock);

drivers/media/pci/intel/ipu3/ipu3-cio2.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define CIO2_DMA_MASK					DMA_BIT_MASK(39)



#define CIO2_IMAGE_MAX_WIDTH				4224U

#define CIO2_IMAGE_MAX_LENGTH				3136U

#define CIO2_IMAGE_MAX_HEIGHT				3136U



/* 32MB = 8xFBPT_entry */

#define CIO2_MAX_LOPS					8