Subject: linux-next: manual merge of the imx-drm tree with the v4l-vdb tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 17 Jun 2019 13:36:29 +1000

Hi all,

Today's linux-next merge of the imx-drm tree got a conflict in:

  drivers/staging/media/imx/imx-ic-prpencvf.c

between commits:

  6d01b7ff5233 ("media: staging/imx: Switch to sync registration for IPU subdevs")
  34ff38745b16 ("media: staging/imx: Pass device to alloc/free_dma_buf")

from the v4l-vdb tree and commit:

  f208b26e61df ("gpu: ipu-v3: ipu-ic: Fully describe colorspace conversions")

from the imx-drm 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/media/imx/imx-ic-prpencvf.c
index 82bba68c554e,f2fe3c11c70e..000000000000
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@@ -460,7 -465,18 +461,18 @@@ static int prp_setup_rotation(struct pr
  	incc = priv->cc[PRPENCVF_SINK_PAD];
  	outcc = vdev->cc;
  
+ 	ret = ipu_ic_calc_csc(&csc,
+ 			      infmt->ycbcr_enc, infmt->quantization,
+ 			      incc->cs,
+ 			      outfmt->ycbcr_enc, outfmt->quantization,
+ 			      outcc->cs);
+ 	if (ret) {
+ 		v4l2_err(&ic_priv->sd, "ipu_ic_calc_csc failed, %d\n",
+ 			 ret);
+ 		return ret;
+ 	}
+ 
 -	ret = imx_media_alloc_dma_buf(priv->md, &priv->rot_buf[0],
 +	ret = imx_media_alloc_dma_buf(ic_priv->ipu_dev, &priv->rot_buf[0],
  				      outfmt->sizeimage);
  	if (ret) {
  		v4l2_err(&ic_priv->sd, "failed to alloc rot_buf[0], %d\n", ret);