drm/sun4i: Rely on dma interconnect for our RAM offset

Now that we can express our DMA topology, rely on those property instead of
hardcoding an offset from the dma_addr_t which wasn't really great.

We still need to add some code to deal with the old DT that would lack that
property, but we move the offset to the DRM device dma_pfn_offset to be
able to rely on just the dma_addr_t associated to the GEM object.

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5df781318e7e05f780a11ed243dcf2b9fe8a08cb.1554108995.git-series.maxime.ripard@bootlin.com

diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
index ee59da4a01728f33a922025e1ae1f7278ac28547..4e5922c89d7becb78e9c30c777c86ef781891c9f 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_backend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
@@ -361,13 +361,6 @@ int sun4i_backend_update_layer_buffer(struct sun4i_backend *backend,
        paddr = drm_fb_cma_get_gem_addr(fb, state, 0);
        DRM_DEBUG_DRIVER("Setting buffer address to %pad\n", &paddr);
 
-       /*
-        * backend DMA accesses DRAM directly, bypassing the system
-        * bus. As such, the address range is different and the buffer
-        * address needs to be corrected.
-        */
-       paddr -= PHYS_OFFSET;
-
        if (fb->format->is_yuv)
                return sun4i_backend_update_yuv_buffer(backend, fb, paddr);
 
@@ -803,6 +796,27 @@ static int sun4i_backend_bind(struct device *dev, struct device *master,
        dev_set_drvdata(dev, backend);
        spin_lock_init(&backend->frontend_lock);
 
+       if (of_find_property(dev->of_node, "interconnects", NULL)) {
+               /*
+                * This assume we have the same DMA constraints for all our the
+                * devices in our pipeline (all the backends, but also the
+                * frontends). This sounds bad, but it has always been the case
+                * for us, and DRM doesn't do per-device allocation either, so
+                * we would need to fix DRM first...
+                */
+               ret = of_dma_configure(drm->dev, dev->of_node, true);
+               if (ret)
+                       return ret;
+       } else {
+               /*
+                * If we don't have the interconnect property, most likely
+                * because of an old DT, we need to set the DMA offset by hand
+                * on our device since the RAM mapping is at 0 for the DMA bus,
+                * unlike the CPU.
+                */
+               drm->dev->dma_pfn_offset = PHYS_PFN_OFFSET;
+       }
+
        backend->engine.node = dev->of_node;
        backend->engine.ops = &sun4i_backend_engine_ops;
        backend->engine.id = sun4i_backend_of_get_id(dev->of_node);