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

Commit 79a6fb1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "Some driver fixes (em28xx, coda, usbtv, s5p, hdpvr and ml86v7667) and
  a fix for media DocBook"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] em28xx: fix assignment of the eeprom data
  [media] hdpvr: fix iteration over uninitialized lists in hdpvr_probe()
  [media] usbtv: fix dependency
  [media] usbtv: Throw corrupted frames away
  [media] usbtv: Fix deinterlacing
  [media] v4l2: added missing mutex.h include to v4l2-ctrls.h
  [media] DocBook: upgrade media_api DocBook version to 4.2
  [media] ml86v7667: fix compile warning: 'ret' set but not used
  [media] s5p-g2d: Fix registration failure
  [media] media: coda: Fix DT driver data pointer for i.MX27
  [media] s5p-mfc: Fix input/output format reporting
parents 58c59bc9 f813b577

Documentation/DocBook/media_api.tmpl

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [

<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;

<!ENTITY media-indices SYSTEM "./media-indices.tmpl">

drivers/media/i2c/ml86v7667.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int ml86v7667_s_ctrl(struct v4l2_ctrl *ctrl) 
{

	struct v4l2_subdev *sd = to_sd(ctrl);

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	int ret;

	int ret = -EINVAL;



	switch (ctrl->id) {

	case V4L2_CID_BRIGHTNESS:
@@ -157,7 +157,7 @@ static int ml86v7667_s_ctrl(struct v4l2_ctrl *ctrl) 
		break;

	}



	return 0;

	return ret;

}



static int ml86v7667_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)

drivers/media/platform/coda.c

+1 −1
Original line number Diff line number Diff line
@@ -1987,7 +1987,7 @@ MODULE_DEVICE_TABLE(platform, coda_platform_ids); 


#ifdef CONFIG_OF

static const struct of_device_id coda_dt_ids[] = {

	{ .compatible = "fsl,imx27-vpu", .data = &coda_platform_ids[CODA_IMX27] },

	{ .compatible = "fsl,imx27-vpu", .data = &coda_devdata[CODA_IMX27] },

	{ .compatible = "fsl,imx53-vpu", .data = &coda_devdata[CODA_IMX53] },

	{ /* sentinel */ }

};

drivers/media/platform/s5p-g2d/g2d.c

+1 −0
Original line number Diff line number Diff line
@@ -784,6 +784,7 @@ static int g2d_probe(struct platform_device *pdev) 
	}

	*vfd = g2d_videodev;

	vfd->lock = &dev->mutex;

	vfd->v4l2_dev = &dev->v4l2_dev;

	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);

	if (ret) {

		v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");

drivers/media/platform/s5p-mfc/s5p_mfc_dec.c

+31 −48
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) 
		pix_mp->num_planes = 2;

		/* Set pixelformat to the format in which MFC

		   outputs the decoded frame */

		pix_mp->pixelformat = V4L2_PIX_FMT_NV12MT;

		pix_mp->pixelformat = ctx->dst_fmt->fourcc;

		pix_mp->plane_fmt[0].bytesperline = ctx->buf_width;

		pix_mp->plane_fmt[0].sizeimage = ctx->luma_size;

		pix_mp->plane_fmt[1].bytesperline = ctx->buf_width;
@@ -382,10 +382,16 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) 
			mfc_err("Unsupported format for source.\n");

			return -EINVAL;

		}

		if (!IS_MFCV6(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) {

		if (fmt->codec_mode == S5P_FIMV_CODEC_NONE) {

			mfc_err("Unknown codec\n");

			return -EINVAL;

		}

		if (!IS_MFCV6(dev)) {

			if (fmt->fourcc == V4L2_PIX_FMT_VP8) {

				mfc_err("Not supported format.\n");

				return -EINVAL;

			}

		}

	} else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {

		fmt = find_format(f, MFC_FMT_RAW);

		if (!fmt) {
@@ -411,7 +417,6 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f) 
	struct s5p_mfc_dev *dev = video_drvdata(file);

	struct s5p_mfc_ctx *ctx = fh_to_ctx(priv);

	int ret = 0;

	struct s5p_mfc_fmt *fmt;

	struct v4l2_pix_format_mplane *pix_mp;



	mfc_debug_enter();
@@ -425,44 +430,14 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f) 
		goto out;

	}

	if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {

		fmt = find_format(f, MFC_FMT_RAW);

		if (!fmt) {

			mfc_err("Unsupported format for source.\n");

			return -EINVAL;

		}

		if (!IS_MFCV6(dev) && (fmt->fourcc != V4L2_PIX_FMT_NV12MT)) {

			mfc_err("Not supported format.\n");

			return -EINVAL;

		} else if (IS_MFCV6(dev) &&

				(fmt->fourcc == V4L2_PIX_FMT_NV12MT)) {

			mfc_err("Not supported format.\n");

			return -EINVAL;

		}

		ctx->dst_fmt = fmt;

		mfc_debug_leave();

		return ret;

	} else if (f->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {

		mfc_err("Wrong type error for S_FMT : %d", f->type);

		return -EINVAL;

	}

	fmt = find_format(f, MFC_FMT_DEC);

	if (!fmt || fmt->codec_mode == S5P_MFC_CODEC_NONE) {

		mfc_err("Unknown codec\n");

		ret = -EINVAL;

		goto out;

	}

	if (fmt->type != MFC_FMT_DEC) {

		mfc_err("Wrong format selected, you should choose "

					"format for decoding\n");

		ret = -EINVAL;

		/* dst_fmt is validated by call to vidioc_try_fmt */

		ctx->dst_fmt = find_format(f, MFC_FMT_RAW);

		ret = 0;

		goto out;

	}

	if (!IS_MFCV6(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) {

		mfc_err("Not supported format.\n");

		return -EINVAL;

	}

	ctx->src_fmt = fmt;

	ctx->codec_mode = fmt->codec_mode;

	} else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {

		/* src_fmt is validated by call to vidioc_try_fmt */

		ctx->src_fmt = find_format(f, MFC_FMT_DEC);

		ctx->codec_mode = ctx->src_fmt->codec_mode;

		mfc_debug(2, "The codec number is: %d\n", ctx->codec_mode);

		pix_mp->height = 0;

		pix_mp->width = 0;
@@ -473,6 +448,14 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f) 
								DEF_CPB_SIZE;

		pix_mp->plane_fmt[0].bytesperline = 0;

		ctx->state = MFCINST_INIT;

		ret = 0;

		goto out;

	} else {

		mfc_err("Wrong type error for S_FMT : %d", f->type);

		ret = -EINVAL;

		goto out;

	}



out:

	mfc_debug_leave();

	return ret;