diff options
| author | Rob Clark <robdclark@gmail.com> | 2014-06-02 07:25:56 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-06-02 07:36:31 -0400 |
| commit | 543d3011f1c193ba2257a754757117cafda2252b (patch) | |
| tree | 555a964e485b107293d1cebb90bd982504a11b1e /drivers/gpu/drm/msm | |
| parent | a0906a023b02366b57eae71c5b9b542d9dd51e4c (diff) | |
| download | op-kernel-dev-543d3011f1c193ba2257a754757117cafda2252b.zip op-kernel-dev-543d3011f1c193ba2257a754757117cafda2252b.tar.gz | |
drm/msm: use correct gfp flag for vram allocation
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>
Diffstat (limited to 'drivers/gpu/drm/msm')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 1d5151a..c071aac 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -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; |
