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

Commit bb61ce54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "Media regression fixes:

   - serial_ir: fix a Kernel crash during boot on Kernel 4.11-rc1, due
     to an IRQ code called too early

   - other IR regression fixes at lirc and at the raw IR decoding

   - a deadlock fix at the RC nuvoton driver

   - fix another issue with DMA on stack at dw2102 driver

  There's an extra patch there that change a driver interface for the
  SoC VSP1 driver, with is shared between the DRM and V4L2 driver. The
  patch itself is trivial, and was acked by David Arlie"

* tag 'media/v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] v4l: vsp1: Adapt vsp1_du_setup_lif() interface to use a structure
  [media] dw2102: don't do DMA on stack
  [media] rc: protocol is not set on register for raw IR devices
  [media] rc: raw decoder for keymap protocol is not loaded on register
  [media] rc: nuvoton: fix deadlock in nvt_write_wakeup_codes
  [media] lirc: fix dead lock between open and wakeup_filter
  [media] serial_ir: ensure we're ready to receive interrupts
parents cb2113cb 8c71fff4

drivers/gpu/drm/rcar-du/rcar_du_vsp.c

+6 −2
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ void rcar_du_vsp_enable(struct rcar_du_crtc *crtc) 
{

	const struct drm_display_mode *mode = &crtc->crtc.state->adjusted_mode;

	struct rcar_du_device *rcdu = crtc->group->dev;

	struct vsp1_du_lif_config cfg = {

		.width = mode->hdisplay,

		.height = mode->vdisplay,

	};

	struct rcar_du_plane_state state = {

		.state = {

			.crtc = &crtc->crtc,
@@ -66,12 +70,12 @@ void rcar_du_vsp_enable(struct rcar_du_crtc *crtc) 
	 */

	crtc->group->need_restart = true;



	vsp1_du_setup_lif(crtc->vsp->vsp, mode->hdisplay, mode->vdisplay);

	vsp1_du_setup_lif(crtc->vsp->vsp, &cfg);

}



void rcar_du_vsp_disable(struct rcar_du_crtc *crtc)

{

	vsp1_du_setup_lif(crtc->vsp->vsp, 0, 0);

	vsp1_du_setup_lif(crtc->vsp->vsp, NULL);

}



void rcar_du_vsp_atomic_begin(struct rcar_du_crtc *crtc)

drivers/media/platform/vsp1/vsp1_drm.c

+16 −17
Original line number Diff line number Diff line
@@ -54,12 +54,11 @@ EXPORT_SYMBOL_GPL(vsp1_du_init); 
/**

 * vsp1_du_setup_lif - Setup the output part of the VSP pipeline

 * @dev: the VSP device

 * @width: output frame width in pixels

 * @height: output frame height in pixels

 * @cfg: the LIF configuration

 *

 * Configure the output part of VSP DRM pipeline for the given frame @width and

 * @height. This sets up formats on the BRU source pad, the WPF0 sink and source

 * pads, and the LIF sink pad.

 * Configure the output part of VSP DRM pipeline for the given frame @cfg.width

 * and @cfg.height. This sets up formats on the BRU source pad, the WPF0 sink

 * and source pads, and the LIF sink pad.

 *

 * As the media bus code on the BRU source pad is conditioned by the

 * configuration of the BRU sink 0 pad, we also set up the formats on all BRU
@@ -69,8 +68,7 @@ EXPORT_SYMBOL_GPL(vsp1_du_init); 
 *

 * Return 0 on success or a negative error code on failure.

 */

int vsp1_du_setup_lif(struct device *dev, unsigned int width,

		      unsigned int height)

int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg)

{

	struct vsp1_device *vsp1 = dev_get_drvdata(dev);

	struct vsp1_pipeline *pipe = &vsp1->drm->pipe;
@@ -79,11 +77,8 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int width, 
	unsigned int i;

	int ret;



	dev_dbg(vsp1->dev, "%s: configuring LIF with format %ux%u\n",

		__func__, width, height);



	if (width == 0 || height == 0) {

		/* Zero width or height means the CRTC is being disabled, stop

	if (!cfg) {

		/* NULL configuration means the CRTC is being disabled, stop

		 * the pipeline and turn the light off.

		 */

		ret = vsp1_pipeline_stop(pipe);
@@ -108,6 +103,9 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int width, 
		return 0;

	}



	dev_dbg(vsp1->dev, "%s: configuring LIF with format %ux%u\n",

		__func__, cfg->width, cfg->height);



	/* Configure the format at the BRU sinks and propagate it through the

	 * pipeline.

	 */
@@ -117,8 +115,8 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int width, 
	for (i = 0; i < bru->entity.source_pad; ++i) {

		format.pad = i;



		format.format.width = width;

		format.format.height = height;

		format.format.width = cfg->width;

		format.format.height = cfg->height;

		format.format.code = MEDIA_BUS_FMT_ARGB8888_1X32;

		format.format.field = V4L2_FIELD_NONE;
@@ -133,8 +131,8 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int width, 
	}



	format.pad = bru->entity.source_pad;

	format.format.width = width;

	format.format.height = height;

	format.format.width = cfg->width;

	format.format.height = cfg->height;

	format.format.code = MEDIA_BUS_FMT_ARGB8888_1X32;

	format.format.field = V4L2_FIELD_NONE;
@@ -180,7 +178,8 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int width, 
	/* Verify that the format at the output of the pipeline matches the

	 * requested frame size and media bus code.

	 */

	if (format.format.width != width || format.format.height != height ||

	if (format.format.width != cfg->width ||

	    format.format.height != cfg->height ||

	    format.format.code != MEDIA_BUS_FMT_ARGB8888_1X32) {

		dev_dbg(vsp1->dev, "%s: format mismatch\n", __func__);

		return -EPIPE;

drivers/media/rc/lirc_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -436,6 +436,8 @@ int lirc_dev_fop_open(struct inode *inode, struct file *file) 
		return -ERESTARTSYS;



	ir = irctls[iminor(inode)];

	mutex_unlock(&lirc_dev_lock);



	if (!ir) {

		retval = -ENODEV;

		goto error;
@@ -476,8 +478,6 @@ int lirc_dev_fop_open(struct inode *inode, struct file *file) 
	}



error:

	mutex_unlock(&lirc_dev_lock);



	nonseekable_open(inode, file);



	return retval;

drivers/media/rc/nuvoton-cir.c

+3 −2
Original line number Diff line number Diff line
@@ -176,12 +176,13 @@ static void nvt_write_wakeup_codes(struct rc_dev *dev, 
{

	u8 tolerance, config;

	struct nvt_dev *nvt = dev->priv;

	unsigned long flags;

	int i;



	/* hardcode the tolerance to 10% */

	tolerance = DIV_ROUND_UP(count, 10);



	spin_lock(&nvt->lock);

	spin_lock_irqsave(&nvt->lock, flags);



	nvt_clear_cir_wake_fifo(nvt);

	nvt_cir_wake_reg_write(nvt, count, CIR_WAKE_FIFO_CMP_DEEP);
@@ -203,7 +204,7 @@ static void nvt_write_wakeup_codes(struct rc_dev *dev, 


	nvt_cir_wake_reg_write(nvt, config, CIR_WAKE_IRCON);



	spin_unlock(&nvt->lock);

	spin_unlock_irqrestore(&nvt->lock, flags);

}



static ssize_t wakeup_data_show(struct device *dev,

drivers/media/rc/rc-main.c

+15 −11
Original line number Diff line number Diff line
@@ -1663,6 +1663,7 @@ static int rc_setup_rx_device(struct rc_dev *dev) 
{

	int rc;

	struct rc_map *rc_map;

	u64 rc_type;



	if (!dev->map_name)

		return -EINVAL;
@@ -1677,15 +1678,18 @@ static int rc_setup_rx_device(struct rc_dev *dev) 
	if (rc)

		return rc;



	if (dev->change_protocol) {

		u64 rc_type = (1ll << rc_map->rc_type);

	rc_type = BIT_ULL(rc_map->rc_type);



	if (dev->change_protocol) {

		rc = dev->change_protocol(dev, &rc_type);

		if (rc < 0)

			goto out_table;

		dev->enabled_protocols = rc_type;

	}



	if (dev->driver_type == RC_DRIVER_IR_RAW)

		ir_raw_load_modules(&rc_type);



	set_bit(EV_KEY, dev->input_dev->evbit);

	set_bit(EV_REP, dev->input_dev->evbit);

	set_bit(EV_MSC, dev->input_dev->evbit);
@@ -1777,12 +1781,6 @@ int rc_register_device(struct rc_dev *dev) 
		dev->input_name ?: "Unspecified device", path ?: "N/A");

	kfree(path);



	if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {

		rc = rc_setup_rx_device(dev);

		if (rc)

			goto out_dev;

	}



	if (dev->driver_type == RC_DRIVER_IR_RAW ||

	    dev->driver_type == RC_DRIVER_IR_RAW_TX) {

		if (!raw_init) {
@@ -1791,7 +1789,13 @@ int rc_register_device(struct rc_dev *dev) 
		}

		rc = ir_raw_event_register(dev);

		if (rc < 0)

			goto out_rx;

			goto out_dev;

	}



	if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {

		rc = rc_setup_rx_device(dev);

		if (rc)

			goto out_raw;

	}



	/* Allow the RC sysfs nodes to be accessible */
@@ -1803,8 +1807,8 @@ int rc_register_device(struct rc_dev *dev) 


	return 0;



out_rx:

	rc_free_rx_device(dev);

out_raw:

	ir_raw_event_unregister(dev);

out_dev:

	device_del(&dev->dev);

out_unlock: