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

Commit 4ba00329 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 for s5p/exynos (mostly race fixes)"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] s5p-mfc: Handle multi-frame input buffer
  [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
  [media] exynos-gsc: Add missing video device vfl_dir flag initialization
  [media] exynos-gsc: Fix settings for input and output image RGB type
  [media] exynos-gsc: Don't use mutex_lock_interruptible() in device release()
  [media] fimc-lite: Don't use mutex_lock_interruptible() in device release()
  [media] s5p-fimc: Don't use mutex_lock_interruptible() in device release()
  [media] s5p-fimc: Prevent race conditions during subdevs registration
parents 25a3bc6b d2a0db1e

drivers/media/platform/exynos-gsc/gsc-m2m.c

+2 −2
Original line number Diff line number Diff line
@@ -657,8 +657,7 @@ static int gsc_m2m_release(struct file *file) 
	pr_debug("pid: %d, state: 0x%lx, refcnt= %d",

		task_pid_nr(current), gsc->state, gsc->m2m.refcnt);



	if (mutex_lock_interruptible(&gsc->lock))

		return -ERESTARTSYS;

	mutex_lock(&gsc->lock);



	v4l2_m2m_ctx_release(ctx->m2m_ctx);

	gsc_ctrls_delete(ctx);
@@ -732,6 +731,7 @@ int gsc_register_m2m_device(struct gsc_dev *gsc) 
	gsc->vdev.ioctl_ops	= &gsc_m2m_ioctl_ops;

	gsc->vdev.release	= video_device_release_empty;

	gsc->vdev.lock		= &gsc->lock;

	gsc->vdev.vfl_dir	= VFL_DIR_M2M;

	snprintf(gsc->vdev.name, sizeof(gsc->vdev.name), "%s.%d:m2m",

					GSC_MODULE_NAME, gsc->id);

drivers/media/platform/exynos-gsc/gsc-regs.h

+8 −8
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ 
#define GSC_IN_ROT_YFLIP		(2 << 16)

#define GSC_IN_ROT_XFLIP		(1 << 16)

#define GSC_IN_RGB_TYPE_MASK		(3 << 14)

#define GSC_IN_RGB_HD_WIDE		(3 << 14)

#define GSC_IN_RGB_HD_NARROW		(2 << 14)

#define GSC_IN_RGB_SD_WIDE		(1 << 14)

#define GSC_IN_RGB_SD_NARROW		(0 << 14)

#define GSC_IN_RGB_HD_NARROW		(3 << 14)

#define GSC_IN_RGB_HD_WIDE		(2 << 14)

#define GSC_IN_RGB_SD_NARROW		(1 << 14)

#define GSC_IN_RGB_SD_WIDE		(0 << 14)

#define GSC_IN_YUV422_1P_ORDER_MASK	(1 << 13)

#define GSC_IN_YUV422_1P_ORDER_LSB_Y	(0 << 13)

#define GSC_IN_YUV422_1P_OEDER_LSB_C	(1 << 13)
@@ -85,10 +85,10 @@ 
#define GSC_OUT_GLOBAL_ALPHA_MASK	(0xff << 24)

#define GSC_OUT_GLOBAL_ALPHA(x)		((x) << 24)

#define GSC_OUT_RGB_TYPE_MASK		(3 << 10)

#define GSC_OUT_RGB_HD_NARROW		(3 << 10)

#define GSC_OUT_RGB_HD_WIDE		(2 << 10)

#define GSC_OUT_RGB_SD_NARROW		(1 << 10)

#define GSC_OUT_RGB_SD_WIDE		(0 << 10)

#define GSC_OUT_RGB_HD_WIDE		(3 << 10)

#define GSC_OUT_RGB_HD_NARROW		(2 << 10)

#define GSC_OUT_RGB_SD_WIDE		(1 << 10)

#define GSC_OUT_RGB_SD_NARROW		(0 << 10)

#define GSC_OUT_YUV422_1P_ORDER_MASK	(1 << 9)

#define GSC_OUT_YUV422_1P_ORDER_LSB_Y	(0 << 9)

#define GSC_OUT_YUV422_1P_OEDER_LSB_C	(1 << 9)

drivers/media/platform/s5p-fimc/fimc-capture.c

+7 −3
Original line number Diff line number Diff line
@@ -556,8 +556,7 @@ static int fimc_capture_close(struct file *file) 


	dbg("pid: %d, state: 0x%lx", task_pid_nr(current), fimc->state);



	if (mutex_lock_interruptible(&fimc->lock))

		return -ERESTARTSYS;

	mutex_lock(&fimc->lock);



	if (--fimc->vid_cap.refcnt == 0) {

		clear_bit(ST_CAPT_BUSY, &fimc->state);
@@ -1774,9 +1773,13 @@ static int fimc_capture_subdev_registered(struct v4l2_subdev *sd) 
	if (ret)

		return ret;



	fimc->pipeline_ops = v4l2_get_subdev_hostdata(sd);



	ret = fimc_register_capture_device(fimc, sd->v4l2_dev);

	if (ret)

	if (ret) {

		fimc_unregister_m2m_device(fimc);

		fimc->pipeline_ops = NULL;

	}



	return ret;

}
@@ -1793,6 +1796,7 @@ static void fimc_capture_subdev_unregistered(struct v4l2_subdev *sd) 
	if (video_is_registered(&fimc->vid_cap.vfd)) {

		video_unregister_device(&fimc->vid_cap.vfd);

		media_entity_cleanup(&fimc->vid_cap.vfd.entity);

		fimc->pipeline_ops = NULL;

	}

	kfree(fimc->vid_cap.ctx);

	fimc->vid_cap.ctx = NULL;

drivers/media/platform/s5p-fimc/fimc-lite.c

+4 −2
Original line number Diff line number Diff line
@@ -491,8 +491,7 @@ static int fimc_lite_close(struct file *file) 
	struct fimc_lite *fimc = video_drvdata(file);

	int ret;



	if (mutex_lock_interruptible(&fimc->lock))

		return -ERESTARTSYS;

	mutex_lock(&fimc->lock);



	if (--fimc->ref_count == 0 && fimc->out_path == FIMC_IO_DMA) {

		clear_bit(ST_FLITE_IN_USE, &fimc->state);
@@ -1263,10 +1262,12 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd) 
		return ret;



	video_set_drvdata(vfd, fimc);

	fimc->pipeline_ops = v4l2_get_subdev_hostdata(sd);



	ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);

	if (ret < 0) {

		media_entity_cleanup(&vfd->entity);

		fimc->pipeline_ops = NULL;

		return ret;

	}
@@ -1285,6 +1286,7 @@ static void fimc_lite_subdev_unregistered(struct v4l2_subdev *sd) 
	if (video_is_registered(&fimc->vfd)) {

		video_unregister_device(&fimc->vfd);

		media_entity_cleanup(&fimc->vfd.entity);

		fimc->pipeline_ops = NULL;

	}

}

drivers/media/platform/s5p-fimc/fimc-m2m.c

+1 −2
Original line number Diff line number Diff line
@@ -718,8 +718,7 @@ static int fimc_m2m_release(struct file *file) 
	dbg("pid: %d, state: 0x%lx, refcnt= %d",

		task_pid_nr(current), fimc->state, fimc->m2m.refcnt);



	if (mutex_lock_interruptible(&fimc->lock))

		return -ERESTARTSYS;

	mutex_lock(&fimc->lock);



	v4l2_m2m_ctx_release(ctx->m2m_ctx);

	fimc_ctrls_delete(ctx);