2 files changed, 8 insertions, 3 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index bb82ef78ca85..81192d00b39e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -286,7 +286,11 @@ static struct drm_driver exynos_drm_driver = {
 
 static int exynos_drm_platform_probe(struct platform_device *pdev)
 {
-        pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+        int ret;
+
+        ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+        if (ret)
+                return ret;
 
         return drm_platform_init(&exynos_drm_driver, pdev);
 }
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index acf667859cb6..701c4c10e08b 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -664,8 +664,9 @@ static int omap_dmm_probe(struct platform_device *dev)
         }
 
         /* set dma mask for device */
-        /* NOTE: this is a workaround for the hwmod not initializing properly */
-        dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+        ret = dma_set_coherent_mask(&dev->dev, DMA_BIT_MASK(32));
+        if (ret)
+                goto fail;
 
         omap_dmm->dummy_pa = page_to_phys(omap_dmm->dummy_page);