Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU

The main DRM device is actually a virtual device so it doesn't have the
iommus property, which is instead on the DMA masters, in this case the
mixers.

Add a call to of_dma_configure with the mixers DT node but on the DRM
virtual device to configure it in the same way than the mixers.

Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/9a4daf438dd3f2fe07afb23688bfb793a0613d7d.1589378833.git-series.maxime@cerno.tech
(cherry picked from commit b718102dbdfd0285ad559687a30e27cc9124e592)
[Maxime: Applied to -fixes since it missed the merge window and display is
broken without it]
Signed-off-by: Maxime Ripard <maxime@cerno.tech>

+13
+13
drivers/gpu/drm/sun4i/sun8i_mixer.c
··· 363 363 mixer->engine.ops = &sun8i_engine_ops; 364 364 mixer->engine.node = dev->of_node; 365 365 366 + if (of_find_property(dev->of_node, "iommus", NULL)) { 367 + /* 368 + * This assume we have the same DMA constraints for 369 + * all our the mixers in our pipeline. This sounds 370 + * bad, but it has always been the case for us, and 371 + * DRM doesn't do per-device allocation either, so we 372 + * would need to fix DRM first... 373 + */ 374 + ret = of_dma_configure(drm->dev, dev->of_node, true); 375 + if (ret) 376 + return ret; 377 + } 378 + 366 379 /* 367 380 * While this function can fail, we shouldn't do anything 368 381 * if this happens. Some early DE2 DT entries don't provide