]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/msm: use correct gfp flag for vram allocation
authorRob Clark <robdclark@gmail.com>
Mon, 2 Jun 2014 11:25:56 +0000 (07:25 -0400)
committerRob Clark <robdclark@gmail.com>
Mon, 2 Jun 2014 11:36:31 +0000 (07:36 -0400)
We want at least __GFP_WAIT, otherwise dma-mapping tries to use coherent
pool rather than CMA pool.

Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/msm_drv.c

index 1d5151ab81e724b93755a4fa9c7fff53cee0a098..c071aacf2752fd0f26dc8cc447c2639416729fd0 100644 (file)
@@ -220,7 +220,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
                 * is bogus, but non-null if allocation succeeded:
                 */
                p = dma_alloc_attrs(dev->dev, size,
-                               &priv->vram.paddr, 0, &attrs);
+                               &priv->vram.paddr, GFP_KERNEL, &attrs);
                if (!p) {
                        dev_err(dev->dev, "failed to allocate VRAM\n");
                        priv->vram.paddr = 0;