diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2013-05-17 12:37:31 +0530 |
---|---|---|
committer | Show Liu <show.liu@linaro.org> | 2014-04-28 11:37:07 +0800 |
commit | 8d483ff13655533766ebc5c0ccbcb980d47b69fa (patch) | |
tree | 7ac7005b617bcede0b0e304a1faf3ec9786f2840 | |
parent | 2771a561959a7a4c02759e1b86819a3975d225c6 (diff) | |
download | linaro-lsk-8d483ff13655533766ebc5c0ccbcb980d47b69fa.tar.gz |
drm/exynos: Force coherent_dma_mask if not already set
Some boards set the coherent_dma_mask as 64 bits (while working
with LPAE). So we need to update coherent_dma_mask only if
it is not already set.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index ba6d995e437..017cc120434 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -294,7 +294,8 @@ static int exynos_drm_platform_probe(struct platform_device *pdev) { DRM_DEBUG_DRIVER("%s\n", __FILE__); - pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); + if (!pdev->dev.coherent_dma_mask) + pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); exynos_drm_driver.num_ioctls = DRM_ARRAY_SIZE(exynos_ioctls); return drm_platform_init(&exynos_drm_driver, pdev); |