Merge tag 'io_uring-5.6-2020-02-14' of git://git.kernel.dk/linux-block

[linux.git] / drivers / gpu / drm / msm / msm_drv.c

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index f50fefb87040976699546a686e5e0163f8ba33a4..e4b750b0c2d3fcdad40761fe6cae1597b2844164 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -138,7 +138,7 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,
 
        size = resource_size(res);
 
-       ptr = devm_ioremap_nocache(&pdev->dev, res->start, size);
+       ptr = devm_ioremap(&pdev->dev, res->start, size);
        if (!ptr) {
                DRM_DEV_ERROR(&pdev->dev, "failed to ioremap: %s\n", name);
                return ERR_PTR(-ENOMEM);
@@ -441,6 +441,14 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)
        if (ret)
                goto err_msm_uninit;
 
+       if (!dev->dma_parms) {
+               dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
+                                             GFP_KERNEL);
+               if (!dev->dma_parms)
+                       return -ENOMEM;
+       }
+       dma_set_max_seg_size(dev, DMA_BIT_MASK(32));
+
        msm_gem_shrinker_init(ddev);
 
        switch (get_mdp_ver(pdev)) {