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

[Mark Brown <broonie@kernel.org>]

[-- 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 --]