mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From 62ee3fb1df901304655927080e80fde99023d288 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Tue, 19 May 2020 14:54:28 +0100
|
|
Subject: [PATCH 428/828] drm/vc4: Adopt the dma configuration from the HVS or
|
|
V3D component
|
|
|
|
vc4_drv isn't necessarily under the /soc node in DT as it is a
|
|
virtual device, but it is the one that does the allocations.
|
|
The DMA addresses are consumed by primarily the HVS or V3D, and
|
|
those require VideoCore cache alias address mapping, and so will be
|
|
under /soc.
|
|
|
|
During probe find the a suitable device node for HVS or V3D,
|
|
and adopt the DMA configuration of that node.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_drv.c | 18 ++++++++++++++++++
|
|
1 file changed, 18 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
|
|
@@ -216,6 +216,14 @@ static void vc4_match_add_drivers(struct
|
|
}
|
|
}
|
|
|
|
+const struct of_device_id vc4_dma_range_matches[] = {
|
|
+ { .compatible = "brcm,bcm2835-hvs" },
|
|
+ { .compatible = "brcm,bcm2835-v3d" },
|
|
+ { .compatible = "brcm,cygnus-v3d" },
|
|
+ { .compatible = "brcm,vc4-v3d" },
|
|
+ {}
|
|
+};
|
|
+
|
|
static int vc4_drm_bind(struct device *dev)
|
|
{
|
|
struct platform_device *pdev = to_platform_device(dev);
|
|
@@ -234,6 +242,16 @@ static int vc4_drm_bind(struct device *d
|
|
vc4_drm_driver.driver_features &= ~DRIVER_RENDER;
|
|
of_node_put(node);
|
|
|
|
+ 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);
|
|
if (IS_ERR(vc4))
|
|
return PTR_ERR(vc4);
|