From b3ed01278cfd2e086d156dc1dd7af4a69eda13c9 Mon Sep 17 00:00:00 2001 From: Simon Xue Date: Wed, 20 Oct 2021 10:13:42 +0800 Subject: [PATCH] drm/rockchip: assign drm device dma_mask to mask(64) from mask(32) dma framework use dma_mask to check device if dma_capable, so set dma_mask to mask(64) to compatible with platform that ddr capacity larger than 4GB or physical address space beyond 32 bit. Change-Id: I04cbe038402db6b48ef2b36a9494fc8eb8c98d6c Signed-off-by: Simon Xue --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 36f78c587535..108229b8f1bf 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -1327,7 +1327,10 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev) rockchip_drm_match_remove(dev); return ret; } - dev->coherent_dma_mask = DMA_BIT_MASK(64); + + ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(64)); + if (ret) + return ret; return 0; }