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

Commit fe5ce61d authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sde: Reject 0 size image for SDE rotator" into msm-4.8

parents 4415d1e1 b1be8db2

drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c

+14 −0
Original line number Diff line number Diff line
@@ -1123,6 +1123,13 @@ static int sde_rotator_try_fmt_vid_cap(struct file *file, 
	struct sde_rotation_config config;

	int ret;



	if ((f->fmt.pix.width == 0) || (f->fmt.pix.height == 0)) {

		SDEDEV_WARN(ctx->rot_dev->dev,

				"Not supporting 0 width/height: %dx%d\n",

				f->fmt.pix.width, f->fmt.pix.height);

		return -EINVAL;

	}



	sde_rot_mgr_lock(rot_dev->mgr);

	sde_rotator_get_config_from_ctx(ctx, &config);

	config.output.format = f->fmt.pix.pixelformat;
@@ -1162,6 +1169,13 @@ static int sde_rotator_try_fmt_vid_out(struct file *file, 
	struct sde_rotation_config config;

	int ret;



	if ((f->fmt.pix.width == 0) || (f->fmt.pix.height == 0)) {

		SDEDEV_WARN(ctx->rot_dev->dev,

				"Not supporting 0 width/height: %dx%d\n",

				f->fmt.pix.width, f->fmt.pix.height);

		return -EINVAL;

	}



	sde_rot_mgr_lock(rot_dev->mgr);

	sde_rotator_get_config_from_ctx(ctx, &config);

	config.input.format = f->fmt.pix.pixelformat;