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

Commit 9823f003 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] ov2640: fix colorspace handling 



The colorspace is independent of whether YUV or RGB is sent to the SoC.
Fix this.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent c1d82b89

drivers/media/i2c/soc_camera/ov2640.c

+7 −16
Original line number Diff line number Diff line
@@ -794,10 +794,11 @@ static int ov2640_set_params(struct i2c_client *client, u32 *width, u32 *height, 
		dev_dbg(&client->dev, "%s: Selected cfmt YUYV (YUV422)", __func__);

		selected_cfmt_regs = ov2640_yuyv_regs;

		break;

	default:

	case MEDIA_BUS_FMT_UYVY8_2X8:

	default:

		dev_dbg(&client->dev, "%s: Selected cfmt UYVY", __func__);

		selected_cfmt_regs = ov2640_uyvy_regs;

		break;

	}



	/* reset hardware */
@@ -865,17 +866,7 @@ static int ov2640_get_fmt(struct v4l2_subdev *sd, 
	mf->width	= priv->win->width;

	mf->height	= priv->win->height;

	mf->code	= priv->cfmt_code;



	switch (mf->code) {

	case MEDIA_BUS_FMT_RGB565_2X8_BE:

	case MEDIA_BUS_FMT_RGB565_2X8_LE:

	mf->colorspace	= V4L2_COLORSPACE_SRGB;

		break;

	default:

	case MEDIA_BUS_FMT_YUYV8_2X8:

	case MEDIA_BUS_FMT_UYVY8_2X8:

		mf->colorspace = V4L2_COLORSPACE_JPEG;

	}

	mf->field	= V4L2_FIELD_NONE;



	return 0;
@@ -897,17 +888,17 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd, 
	ov2640_select_win(&mf->width, &mf->height);



	mf->field	= V4L2_FIELD_NONE;

	mf->colorspace	= V4L2_COLORSPACE_SRGB;



	switch (mf->code) {

	case MEDIA_BUS_FMT_RGB565_2X8_BE:

	case MEDIA_BUS_FMT_RGB565_2X8_LE:

		mf->colorspace = V4L2_COLORSPACE_SRGB;

	case MEDIA_BUS_FMT_YUYV8_2X8:

	case MEDIA_BUS_FMT_UYVY8_2X8:

		break;

	default:

		mf->code = MEDIA_BUS_FMT_UYVY8_2X8;

	case MEDIA_BUS_FMT_YUYV8_2X8:

	case MEDIA_BUS_FMT_UYVY8_2X8:

		mf->colorspace = V4L2_COLORSPACE_JPEG;

		break;

	}



	if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)