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

Commit b80cb8dc authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab
Browse files

[media] media: s5p_mfc: remove s5p_mfc_get_node_type() function 



s5p_mfc_get_node_type() relies on get_index() helper function, which in
turn relies on video_device index numbers assigned on driver
registration. All this code is not really needed, because there is
already access to respective video_device structures via common
s5p_mfc_dev structure. This fixes the issues introduced by patch
1056e438 ("v4l2-dev: Fix race condition
on __video_register_device"), which has been merged in v3.12-rc1.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 4773ab99

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

+7 −21
Original line number Diff line number Diff line
@@ -177,21 +177,6 @@ unlock: 
		mutex_unlock(&dev->mfc_mutex);

}



static enum s5p_mfc_node_type s5p_mfc_get_node_type(struct file *file)

{

	struct video_device *vdev = video_devdata(file);



	if (!vdev) {

		mfc_err("failed to get video_device");

		return MFCNODE_INVALID;

	}

	if (vdev->index == 0)

		return MFCNODE_DECODER;

	else if (vdev->index == 1)

		return MFCNODE_ENCODER;

	return MFCNODE_INVALID;

}



static void s5p_mfc_clear_int_flags(struct s5p_mfc_dev *dev)

{

	mfc_write(dev, 0, S5P_FIMV_RISC_HOST_INT);
@@ -705,6 +690,7 @@ irq_cleanup_hw: 
/* Open an MFC node */

static int s5p_mfc_open(struct file *file)

{

	struct video_device *vdev = video_devdata(file);

	struct s5p_mfc_dev *dev = video_drvdata(file);

	struct s5p_mfc_ctx *ctx = NULL;

	struct vb2_queue *q;
@@ -742,7 +728,7 @@ static int s5p_mfc_open(struct file *file) 
	/* Mark context as idle */

	clear_work_bit_irqsave(ctx);

	dev->ctx[ctx->num] = ctx;

	if (s5p_mfc_get_node_type(file) == MFCNODE_DECODER) {

	if (vdev == dev->vfd_dec) {

		ctx->type = MFCINST_DECODER;

		ctx->c_ops = get_dec_codec_ops();

		s5p_mfc_dec_init(ctx);
@@ -752,7 +738,7 @@ static int s5p_mfc_open(struct file *file) 
			mfc_err("Failed to setup mfc controls\n");

			goto err_ctrls_setup;

		}

	} else if (s5p_mfc_get_node_type(file) == MFCNODE_ENCODER) {

	} else if (vdev == dev->vfd_enc) {

		ctx->type = MFCINST_ENCODER;

		ctx->c_ops = get_enc_codec_ops();

		/* only for encoder */
@@ -797,10 +783,10 @@ static int s5p_mfc_open(struct file *file) 
	q = &ctx->vq_dst;

	q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;

	q->drv_priv = &ctx->fh;

	if (s5p_mfc_get_node_type(file) == MFCNODE_DECODER) {

	if (vdev == dev->vfd_dec) {

		q->io_modes = VB2_MMAP;

		q->ops = get_dec_queue_ops();

	} else if (s5p_mfc_get_node_type(file) == MFCNODE_ENCODER) {

	} else if (vdev == dev->vfd_enc) {

		q->io_modes = VB2_MMAP | VB2_USERPTR;

		q->ops = get_enc_queue_ops();

	} else {
@@ -819,10 +805,10 @@ static int s5p_mfc_open(struct file *file) 
	q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;

	q->io_modes = VB2_MMAP;

	q->drv_priv = &ctx->fh;

	if (s5p_mfc_get_node_type(file) == MFCNODE_DECODER) {

	if (vdev == dev->vfd_dec) {

		q->io_modes = VB2_MMAP;

		q->ops = get_dec_queue_ops();

	} else if (s5p_mfc_get_node_type(file) == MFCNODE_ENCODER) {

	} else if (vdev == dev->vfd_enc) {

		q->io_modes = VB2_MMAP | VB2_USERPTR;

		q->ops = get_enc_queue_ops();

	} else {

drivers/media/platform/s5p-mfc/s5p_mfc_common.h

+0 −9
Original line number Diff line number Diff line
@@ -114,15 +114,6 @@ enum s5p_mfc_fmt_type { 
	MFC_FMT_RAW,

};



/**

 * enum s5p_mfc_node_type - The type of an MFC device node.

 */

enum s5p_mfc_node_type {

	MFCNODE_INVALID = -1,

	MFCNODE_DECODER = 0,

	MFCNODE_ENCODER = 1,

};



/**

 * enum s5p_mfc_inst_type - The type of an MFC instance.

 */