drm/msm: use contiguous vram for MSM_BO_SCANOUT when possible

Makes it possible to have MMU for GPU but not display.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index ee44b0f..38b7f4e 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -977,7 +977,7 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev,
 
        if (!iommu_present(&platform_bus_type))
                use_vram = true;
 
        if (!iommu_present(&platform_bus_type))
                use_vram = true;

-       else if ((flags & MSM_BO_STOLEN) && priv->vram.size)
+       else if ((flags & (MSM_BO_STOLEN | MSM_BO_SCANOUT)) && priv->vram.size)

                use_vram = true;
 
        if (WARN_ON(use_vram && !priv->vram.size))
                use_vram = true;
 
        if (WARN_ON(use_vram && !priv->vram.size))