linux-next: manual merge of the v4l-dvb tree with the origin tree

linux-next: manual merge of the v4l-dvb tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 10336 bytes --]

Hi all,

Today's linux-next merge of the v4l-dvb tree got a conflict in:

  drivers/media/rc/rc-main.c

between commit:

  0af298e62e5cf ("treewide: refresh kmalloc_obj() conversions")

from the origin tree and commit:

  8da461248793a ("media: rc: struct rc_map should have entries and capacity")

from the v4l-dvb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/media/rc/rc-main.c
index 4bf645ac8d7b5,e2e99ea635166..0000000000000
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@@ -8,7 -8,6 +8,6 @@@
  #include <media/rc-core.h>
  #include <linux/bsearch.h>
  #include <linux/spinlock.h>
- #include <linux/delay.h>
  #include <linux/input.h>
  #include <linux/leds.h>
  #include <linux/slab.h>
@@@ -114,8 -113,6 +113,6 @@@ struct rc_map *rc_map_get(const char *n
  			pr_err("Couldn't load IR keymap %s\n", name);
  			return NULL;
  		}
- 		msleep(20);	/* Give some time for IR to register */
- 
  		map = seek_rc_map(name);
  	}
  #endif
@@@ -155,7 -152,7 +152,7 @@@ static struct rc_map_table empty[] = 
  static struct rc_map_list empty_map = {
  	.map = {
  		.scan     = empty,
- 		.size     = ARRAY_SIZE(empty),
+ 		.entries  = ARRAY_SIZE(empty),
  		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
  		.name     = RC_MAP_EMPTY,
  	}
@@@ -202,10 -199,11 +199,11 @@@ static int scancode_to_u64(const struc
   * @rc_map:	the rc_map to initialize
   * @map_name:	name to assign to the table
   * @rc_proto:	ir type to assign to the new table
-  * @size:	initial size of the table
+  * @size:	number of entries the table must be able to hold
   *
   * This routine will initialize the rc_map and will allocate
-  * memory to hold at least the specified number of elements.
+  * memory to hold at least @size entries; the capacity is rounded up
+  * to a power of two.
   *
   * return:	zero on success or a negative error code
   */
@@@ -213,15 -211,15 +211,15 @@@ static int ir_create_table(struct rc_de
  			   const char *map_name, u64 rc_proto, size_t size)
  {
  	struct rc_map_table *scan;
- 	unsigned int alloc;
+ 	unsigned int capacity;
  	char *name;
  
  	name = kstrdup(map_name, GFP_KERNEL);
  	if (!name)
  		return -ENOMEM;
  
 -	capacity = roundup_pow_of_two(size);
 -	scan = kmalloc_objs(struct rc_map_table, capacity, GFP_KERNEL);
 +	alloc = roundup_pow_of_two(size);
 +	scan = kmalloc_objs(struct rc_map_table, alloc);
  	if (!scan) {
  		kfree(name);
  		return -ENOMEM;
@@@ -231,12 -229,12 +229,12 @@@
  		rc_map->name = name;
  		rc_map->scan = scan;
  		rc_map->rc_proto = rc_proto;
- 		rc_map->len = 0;
- 		rc_map->size = alloc;
+ 		rc_map->entries = 0;
+ 		rc_map->capacity = capacity;
  	}
  
  	dev_dbg(&dev->dev, "Allocated space for %u keycode entries (%zu bytes)\n",
- 		alloc, alloc * sizeof(struct rc_map_table));
+ 		capacity, capacity * sizeof(struct rc_map_table));
  	return 0;
  }
  
@@@ -256,8 -254,8 +254,8 @@@ static void ir_free_table(struct rc_ma
  		name = rc_map->name;
  		scan = rc_map->scan;
  
- 		rc_map->size = 0;
- 		rc_map->len = 0;
+ 		rc_map->capacity = 0;
+ 		rc_map->entries = 0;
  		rc_map->name = NULL;
  		rc_map->scan = NULL;
  	}
@@@ -280,37 -278,38 +278,38 @@@
  static int ir_resize_table(struct rc_dev *dev, struct rc_map *rc_map,
  			   gfp_t gfp_flags)
  {
- 	unsigned int newsize = rc_map->size;
+ 	unsigned int new_capacity = rc_map->capacity;
  	struct rc_map_table *newscan;
  
  	lockdep_assert_held(&rc_map->lock);
  
- 	if (rc_map->size == rc_map->len) {
+ 	if (rc_map->capacity == rc_map->entries) {
  		/* All entries in use -> grow keytable */
- 		if (newsize >= IR_TAB_MAX_ENTRIES)
+ 		if (new_capacity >= IR_TAB_MAX_ENTRIES)
  			return -ENOMEM;
  
- 		newsize *= 2;
+ 		new_capacity *= 2;
  
- 		dev_dbg(&dev->dev, "Growing table to %u entries\n", newsize);
+ 		dev_dbg(&dev->dev, "Growing table to %u entries\n", new_capacity);
  	}
  
- 	if (rc_map->len * 3 < rc_map->size && rc_map->size > IR_TAB_MIN_ENTRIES) {
+ 	if (rc_map->entries * 3 < rc_map->capacity &&
+ 	    rc_map->capacity > IR_TAB_MIN_ENTRIES) {
  		/* Less than 1/3 of entries in use -> shrink keytable */
- 		newsize /= 2;
- 		dev_dbg(&dev->dev, "Shrinking table to %u entries\n", newsize);
+ 		new_capacity /= 2;
+ 		dev_dbg(&dev->dev, "Shrinking table to %u entries\n", new_capacity);
  	}
  
- 	if (newsize == rc_map->size)
+ 	if (new_capacity == rc_map->capacity)
  		return 0;
  
- 	newscan = krealloc_array(rc_map->scan, newsize,
+ 	newscan = krealloc_array(rc_map->scan, new_capacity,
  				 sizeof(struct rc_map_table), gfp_flags);
  	if (!newscan)
  		return -ENOMEM;
  
  	rc_map->scan = newscan;
- 	rc_map->size = newsize;
+ 	rc_map->capacity = new_capacity;
  
  	return 0;
  }
@@@ -342,9 -341,9 +341,9 @@@ static unsigned int ir_update_mapping(s
  	if (new_keycode == KEY_RESERVED || new_keycode == KEY_UNKNOWN) {
  		dev_dbg(&dev->dev, "#%d: Deleting scan 0x%04llx\n",
  			index, rc_map->scan[index].scancode);
- 		rc_map->len--;
+ 		rc_map->entries--;
  		memmove(&rc_map->scan[index], &rc_map->scan[index+ 1],
- 			(rc_map->len - index) * sizeof(struct rc_map_table));
+ 			(rc_map->entries - index) * sizeof(struct rc_map_table));
  	} else {
  		dev_dbg(&dev->dev, "#%d: %s scan 0x%04llx with key 0x%04x\n",
  			index,
@@@ -358,7 -357,7 +357,7 @@@
  		/* A previous mapping was updated... */
  		__clear_bit(old_keycode, dev->input_dev->keybit);
  		/* ... but another scancode might use the same keycode */
- 		for (i = 0; i < rc_map->len; i++) {
+ 		for (i = 0; i < rc_map->entries; i++) {
  			if (rc_map->scan[i].keycode == old_keycode) {
  				__set_bit(old_keycode, dev->input_dev->keybit);
  				break;
@@@ -410,7 -409,7 +409,7 @@@ static unsigned int ir_establish_scanco
  	 * Binary search for an existing mapping for this ir command.
  	 */
  	lo = 0;
- 	hi = rc_map->len;
+ 	hi = rc_map->entries;
  	while (lo < hi) {
  		i = lo + (hi - lo) / 2;
  		if (rc_map->scan[i].scancode == scancode)
@@@ -423,18 -422,18 +422,18 @@@
  	i = lo;
  
  	/* No previous mapping found, we might need to grow the table */
- 	if (rc_map->size == rc_map->len) {
+ 	if (rc_map->capacity == rc_map->entries) {
  		if (!resize || ir_resize_table(dev, rc_map, GFP_ATOMIC))
  			return UINT_MAX;
  	}
  
  	/* i is the proper index to insert our new keycode */
- 	if (i < rc_map->len)
+ 	if (i < rc_map->entries)
  		memmove(&rc_map->scan[i + 1], &rc_map->scan[i],
- 			(rc_map->len - i) * sizeof(struct rc_map_table));
+ 			(rc_map->entries - i) * sizeof(struct rc_map_table));
  	rc_map->scan[i].scancode = scancode;
  	rc_map->scan[i].keycode = KEY_RESERVED;
- 	rc_map->len++;
+ 	rc_map->entries++;
  
  	return i;
  }
@@@ -464,7 -463,7 +463,7 @@@ static int ir_setkeycode(struct input_d
  
  	if (ke->flags & INPUT_KEYMAP_BY_INDEX) {
  		index = ke->index;
- 		if (index >= rc_map->len) {
+ 		if (index >= rc_map->entries) {
  			retval = -EINVAL;
  			goto out;
  		}
@@@ -474,7 -473,7 +473,7 @@@
  			goto out;
  
  		index = ir_establish_scancode(rdev, rc_map, scancode, true);
- 		if (index >= rc_map->len) {
+ 		if (index >= rc_map->entries) {
  			retval = -ENOMEM;
  			goto out;
  		}
@@@ -503,15 -502,15 +502,15 @@@ static int ir_setkeytable(struct rc_de
  	int rc;
  
  	rc = ir_create_table(dev, rc_map, from->name, from->rc_proto,
- 			     from->size);
+ 			     from->entries);
  	if (rc)
  		return rc;
  
  	scoped_guard(spinlock_irqsave, &rc_map->lock) {
- 		for (i = 0; i < from->size; i++) {
+ 		for (i = 0; i < from->entries; i++) {
  			index = ir_establish_scancode(dev, rc_map,
  						      from->scan[i].scancode, false);
- 			if (index >= rc_map->len) {
+ 			if (index >= rc_map->entries) {
  				rc = -ENOMEM;
  				break;
  			}
@@@ -556,7 -555,7 +555,7 @@@ static unsigned int ir_lookup_by_scanco
  
  	lockdep_assert_held(&rc_map->lock);
  
- 	res = bsearch(&scancode, rc_map->scan, rc_map->len,
+ 	res = bsearch(&scancode, rc_map->scan, rc_map->entries,
  		      sizeof(struct rc_map_table), rc_map_cmp);
  	if (!res)
  		return -1U;
@@@ -596,7 -595,7 +595,7 @@@ static int ir_getkeycode(struct input_d
  		index = ir_lookup_by_scancode(rc_map, scancode);
  	}
  
- 	if (index < rc_map->len) {
+ 	if (index < rc_map->entries) {
  		entry = &rc_map->scan[index];
  
  		ke->index = index;
@@@ -644,7 -643,7 +643,7 @@@ u32 rc_g_keycode_from_table(struct rc_d
  	spin_lock_irqsave(&rc_map->lock, flags);
  
  	index = ir_lookup_by_scancode(rc_map, scancode);
- 	keycode = index < rc_map->len ?
+ 	keycode = index < rc_map->entries ?
  			rc_map->scan[index].keycode : KEY_RESERVED;
  
  	spin_unlock_irqrestore(&rc_map->lock, flags);
@@@ -1278,7 -1277,6 +1277,6 @@@ void ir_raw_load_modules(u64 *protocols
  			*protocols &= ~proto_names[i].type;
  			continue;
  		}
- 		msleep(20);
  		available = ir_raw_get_allowed_protocols();
  		if (!(*protocols & proto_names[i].type & ~available))
  			continue;
@@@ -1841,7 -1839,7 +1839,7 @@@ static int rc_prepare_rx_device(struct 
  	rc_map = rc_map_get(dev->map_name);
  	if (!rc_map)
  		rc_map = rc_map_get(RC_MAP_EMPTY);
- 	if (!rc_map || !rc_map->scan || rc_map->size == 0)
+ 	if (!rc_map || !rc_map->scan || rc_map->entries == 0)
  		return -EINVAL;
  
  	rc = ir_setkeytable(dev, rc_map);
@@@ -2075,10 -2073,12 +2073,12 @@@ void rc_unregister_device(struct rc_de
  	if (dev->driver_type == RC_DRIVER_IR_RAW)
  		ir_raw_event_unregister(dev);
  
- 	timer_delete_sync(&dev->timer_keyup);
- 	timer_delete_sync(&dev->timer_repeat);
+ 	if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {
+ 		timer_delete_sync(&dev->timer_keyup);
+ 		timer_delete_sync(&dev->timer_repeat);
  
- 	rc_free_rx_device(dev);
+ 		rc_free_rx_device(dev);
+ 	}
  
  	/*
  	 * lirc device should be freed with dev->registered = false, so

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the v4l-dvb tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2206 bytes --]

Hi all,

Today's linux-next merge of the v4l-dvb tree got a conflict in:

  drivers/media/platform/qcom/iris/iris_vdec.c

between commit:

  3d9593ad1a58c ("media: iris: fix use-after-free of fmt_src during MBPF check")

from the origin tree and commits:

  65c06d2edded3 ("media: qcom: iris: vdec: allow GEN2 decoding into 10bit format")
  56f93da11a7c3 ("media: iris: drop struct iris_fmt")

from the v4l-dvb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/media/platform/qcom/iris/iris_vdec.c
index 99d544e2af4f9,a8d6354bee28f..0000000000000
--- a/drivers/media/platform/qcom/iris/iris_vdec.c
+++ b/drivers/media/platform/qcom/iris/iris_vdec.c
@@@ -61,23 -62,24 +62,18 @@@ int iris_vdec_inst_init(struct iris_ins
  	return iris_ctrls_init(inst);
  }
  
- static const struct iris_fmt iris_vdec_formats_cap[] = {
- 	[IRIS_FMT_NV12] = {
- 		.pixfmt = V4L2_PIX_FMT_NV12,
- 		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
- 	},
- 	[IRIS_FMT_QC08C] = {
- 		.pixfmt = V4L2_PIX_FMT_QC08C,
- 		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
- 	},
 -void iris_vdec_inst_deinit(struct iris_inst *inst)
 -{
 -	kfree(inst->fmt_dst);
 -	kfree(inst->fmt_src);
 -}
 -
+ static const u32 iris_vdec_formats_cap[] = {
+ 	[IRIS_FMT_NV12] = V4L2_PIX_FMT_NV12,
+ 	[IRIS_FMT_QC08C] = V4L2_PIX_FMT_QC08C,
+ 	[IRIS_FMT_TP10] =  V4L2_PIX_FMT_P010,
+ 	[IRIS_FMT_QC10C] =  V4L2_PIX_FMT_QC10C,
  };
  
- static const struct iris_fmt *
- find_format(struct iris_inst *inst, u32 pixfmt, u32 type)
+ static bool check_format(struct iris_inst *inst, u32 pixfmt, u32 type)
  {
- 	const struct iris_fmt *fmt = NULL;
- 	unsigned int size = 0;
- 	unsigned int i;
+ 	unsigned int size, i;
+ 	const u32 *fmt;
+ 
  	switch (type) {
  	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
  		fmt = inst->core->iris_platform_data->inst_iris_fmts;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the v4l-dvb tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 5664 bytes --]

Hi all,

Today's linux-next merge of the v4l-dvb tree got conflicts in:

  drivers/media/platform/qcom/iris/iris_core.c
  drivers/media/platform/qcom/iris/iris_vdec.c
  drivers/media/platform/qcom/iris/iris_venc.c
  drivers/media/platform/qcom/iris/iris_vpu_common.c

between commits:

  95a337f92f0a6 ("media: iris: switch to hardware mode after firmware boot")
  3d9593ad1a58c ("media: iris: fix use-after-free of fmt_src during MBPF check")

from the origin tree and commits:

  56f93da11a7c3 ("media: iris: drop struct iris_fmt")
  4147ffa3d96dd ("media: iris: Add hardware power on/off ops for X1P42100")
  3395d7526386d ("media: iris: Initialize HFI ops after firmware load in core init")
  56f93da11a7c3 ("media: iris: drop struct iris_fmt")

from the v4l-dvb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/media/platform/qcom/iris/iris_core.c
index dbaac01eb15a0,a1823ded46e87..0000000000000
--- a/drivers/media/platform/qcom/iris/iris_core.c
+++ b/drivers/media/platform/qcom/iris/iris_core.c
@@@ -75,10 -74,8 +74,12 @@@ int iris_core_init(struct iris_core *co
  	if (ret)
  		goto error_unload_fw;
  
 +	ret = iris_vpu_switch_to_hwmode(core);
 +	if (ret)
 +		goto error_unload_fw;
 +
+ 	core->iris_firmware_data->init_hfi_ops(core);
+ 
  	ret = iris_hfi_core_init(core);
  	if (ret)
  		goto error_unload_fw;
diff --cc drivers/media/platform/qcom/iris/iris_vdec.c
index 99d544e2af4f9,b65832042dc85..0000000000000
--- a/drivers/media/platform/qcom/iris/iris_vdec.c
+++ b/drivers/media/platform/qcom/iris/iris_vdec.c
@@@ -61,23 -62,22 +62,16 @@@ int iris_vdec_inst_init(struct iris_ins
  	return iris_ctrls_init(inst);
  }
  
- static const struct iris_fmt iris_vdec_formats_cap[] = {
- 	[IRIS_FMT_NV12] = {
- 		.pixfmt = V4L2_PIX_FMT_NV12,
- 		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
- 	},
- 	[IRIS_FMT_QC08C] = {
- 		.pixfmt = V4L2_PIX_FMT_QC08C,
- 		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
- 	},
 -void iris_vdec_inst_deinit(struct iris_inst *inst)
 -{
 -	kfree(inst->fmt_dst);
 -	kfree(inst->fmt_src);
 -}
 -
+ static const u32 iris_vdec_formats_cap[] = {
+ 	[IRIS_FMT_NV12] = V4L2_PIX_FMT_NV12,
+ 	[IRIS_FMT_QC08C] = V4L2_PIX_FMT_QC08C,
  };
  
- static const struct iris_fmt *
- find_format(struct iris_inst *inst, u32 pixfmt, u32 type)
+ static bool check_format(struct iris_inst *inst, u32 pixfmt, u32 type)
  {
- 	const struct iris_fmt *fmt = NULL;
- 	unsigned int size = 0;
- 	unsigned int i;
+ 	unsigned int size, i;
+ 	const u32 *fmt;
+ 
  	switch (type) {
  	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
  		fmt = inst->core->iris_platform_data->inst_iris_fmts;
diff --cc drivers/media/platform/qcom/iris/iris_venc.c
index 4d886769d958b,2398992d05960..0000000000000
--- a/drivers/media/platform/qcom/iris/iris_venc.c
+++ b/drivers/media/platform/qcom/iris/iris_venc.c
@@@ -79,34 -79,27 +79,21 @@@ int iris_venc_inst_init(struct iris_ins
  	return iris_ctrls_init(inst);
  }
  
- static const struct iris_fmt iris_venc_formats_cap[] = {
- 	[IRIS_FMT_H264] = {
- 		.pixfmt = V4L2_PIX_FMT_H264,
- 		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
- 	},
- 	[IRIS_FMT_HEVC] = {
- 		.pixfmt = V4L2_PIX_FMT_HEVC,
- 		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
- 	},
 -void iris_venc_inst_deinit(struct iris_inst *inst)
 -{
 -	kfree(inst->fmt_dst);
 -	kfree(inst->fmt_src);
 -}
 -
+ static const u32 iris_venc_formats_cap[] = {
+ 	[IRIS_FMT_H264] = V4L2_PIX_FMT_H264,
+ 	[IRIS_FMT_HEVC] = V4L2_PIX_FMT_HEVC,
  };
  
- static const struct iris_fmt iris_venc_formats_out[] = {
- 	[IRIS_FMT_NV12] = {
- 		.pixfmt = V4L2_PIX_FMT_NV12,
- 		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
- 	},
- 	[IRIS_FMT_QC08C] = {
- 		.pixfmt = V4L2_PIX_FMT_QC08C,
- 		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
- 	},
+ static const u32 iris_venc_formats_out[] = {
+ 	[IRIS_FMT_NV12] = V4L2_PIX_FMT_NV12,
+ 	[IRIS_FMT_QC08C] = V4L2_PIX_FMT_QC08C,
  };
  
- static const struct iris_fmt *
- find_format(struct iris_inst *inst, u32 pixfmt, u32 type)
+ static bool check_format(struct iris_inst *inst, u32 pixfmt, u32 type)
  {
- 	const struct iris_fmt *fmt = NULL;
- 	unsigned int size = 0;
- 	unsigned int i;
+ 	unsigned int size, i;
+ 	const u32 *fmt;
+ 
  	switch (type) {
  	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
  		fmt = iris_venc_formats_out;
diff --cc drivers/media/platform/qcom/iris/iris_vpu_common.c
index 69e6126dc4d95,5a85568c5ee1c..0000000000000
--- a/drivers/media/platform/qcom/iris/iris_vpu_common.c
+++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c
@@@ -292,8 -293,20 +293,14 @@@ int iris_vpu_power_on_hw(struct iris_co
  	if (ret && ret != -ENOENT)
  		goto err_disable_hw_clock;
  
+ 	ret = iris_prepare_enable_clock(core, IRIS_BSE_HW_CLK);
+ 	if (ret && ret != -ENOENT)
+ 		goto err_disable_hw_ahb_clock;
+ 
 -	ret = dev_pm_genpd_set_hwmode(core->pmdomain_tbl->pd_devs[IRIS_HW_POWER_DOMAIN], true);
 -	if (ret)
 -		goto err_disable_bse_hw_clock;
 -
  	return 0;
  
 -err_disable_bse_hw_clock:
 -	iris_disable_unprepare_clock(core, IRIS_BSE_HW_CLK);
+ err_disable_hw_ahb_clock:
+ 	iris_disable_unprepare_clock(core, IRIS_HW_AHB_CLK);
  err_disable_hw_clock:
  	iris_disable_unprepare_clock(core, IRIS_HW_CLK);
  err_disable_power:

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]