linux-next: manual merge of the drm-misc tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/gpu/drm/vc4/vc4_drv.c

between commit:

  538f11116061 ("drm/vc4: drv: Register a different driver on BCM2711")

from Linus' tree and commit:

  da8e393e23ef ("drm/vc4: drv: Adopt the dma configuration from the HVS or V3D component")

from the drm-misc 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/gpu/drm/vc4/vc4_drv.c
index 0f0f0263e744,14a7d529144d..000000000000
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@@ -281,16 -230,25 +290,26 @@@ static int vc4_drm_bind(struct device *
  
  	dev->coherent_dma_mask = DMA_BIT_MASK(32);
  
 -	/* If VC4 V3D is missing, don't advertise render nodes. */
 -	node = of_find_matching_node_and_match(NULL, vc4_v3d_dt_match, NULL);
 -	if (!node || !of_device_is_available(node))
 -		vc4_drm_driver.driver_features &= ~DRIVER_RENDER;
 -	of_node_put(node);
 +	is_vc5 = of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5");
 +	if (is_vc5)
 +		driver = &vc5_drm_driver;
 +	else
 +		driver = &vc4_drm_driver;
  
+ 	node = of_find_matching_node_and_match(NULL, vc4_dma_range_matches,
+ 					       NULL);
+ 	if (node) {
+ 		ret = of_dma_configure(dev, node, true);
+ 		of_node_put(node);
+ 
+ 		if (ret)
+ 			return ret;
+ 	}
+ 
 -	vc4 = devm_drm_dev_alloc(dev, &vc4_drm_driver, struct vc4_dev, base);
 +	vc4 = devm_drm_dev_alloc(dev, driver, struct vc4_dev, base);
  	if (IS_ERR(vc4))
  		return PTR_ERR(vc4);
 +	vc4->is_vc5 = is_vc5;
  
  	drm = &vc4->base;
  	platform_set_drvdata(pdev, drm);

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