]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
msm/gpu/a6xx: Force of_dma_configure to setup DMA for GMU
authorJordan Crouse <jcrouse@codeaurora.org>
Fri, 14 Sep 2018 15:03:46 +0000 (09:03 -0600)
committerRob Clark <robdclark@gmail.com>
Thu, 4 Oct 2018 00:24:55 +0000 (20:24 -0400)
The point of the 'force_dma' parameter for of_dma_configure
is to force the device to be set up even if DMA capability is
not described by the firmware which is exactly the use case
 we have for GMU - we need SMMU to get set up but we have no
other dma capabilities since memory is managed by the GPU
driver. Currently we pass false so of_dma_configure() fails
and subsequently GMU and GPU probe does as well.

Fixes: 4b565ca5a2c ("drm/msm: Add A6XX device support")
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Tested-by: Sibi Sankar <sibis@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/adreno/a6xx_gmu.c

index a10cc4475361cc435cf8854e93259570965d9cc5..9265adf8a1d33ba794938d8e88b21830bd9ce03b 100644 (file)
@@ -1159,7 +1159,7 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)
 
        gmu->dev = &pdev->dev;
 
-       of_dma_configure(gmu->dev, node, false);
+       of_dma_configure(gmu->dev, node, true);
 
        /* Fow now, don't do anything fancy until we get our feet under us */
        gmu->idle_level = GMU_IDLE_STATE_ACTIVE;