From: Dave Airlie <airlied@redhat.com>
Date: Wed, 13 Jul 2022 00:54:56 +0000 (+1000)
Subject: Backmerge tag 'v5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e23a5e14aa278858c2e3d81ec34e83aa9a4177c5;p=linux.git

Backmerge tag 'v5.19-rc6' of git://git./linux/kernel/git/torvalds/linux into drm-next

Backmerge in rc6 so I can merge msm next easier.

Linux 5.19-rc6

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

e23a5e14aa278858c2e3d81ec34e83aa9a4177c5
diff --cc drivers/gpu/drm/vc4/vc4_drv.c
index 680eaef7287f5,0f0f0263e744c..292d1b6a01b6f
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@@ -230,25 -281,16 +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);
diff --cc drivers/gpu/drm/vc4/vc4_plane.c
index 5507f2cd7a275,1e866dc00ac32..f27e87a23df77
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@@ -1520,13 -1500,12 +1530,16 @@@ struct drm_plane *vc4_plane_init(struc
  	if (ret)
  		return ERR_PTR(ret);
  
- 	drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
+ 	if (vc4->is_vc5)
+ 		drm_plane_helper_add(plane, &vc5_plane_helper_funcs);
+ 	else
+ 		drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
  
  	drm_plane_create_alpha_property(plane);
 +	drm_plane_create_blend_mode_property(plane,
 +					     BIT(DRM_MODE_BLEND_PIXEL_NONE) |
 +					     BIT(DRM_MODE_BLEND_PREMULTI) |
 +					     BIT(DRM_MODE_BLEND_COVERAGE));
  	drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0,
  					   DRM_MODE_ROTATE_0 |
  					   DRM_MODE_ROTATE_180 |