From: Jonathan Marek Date: Thu, 22 Nov 2018 01:52:30 +0000 (-0500) Subject: drm/msm: use contiguous vram for MSM_BO_SCANOUT when possible X-Git-Tag: v5.15~7388^2~1^2~51 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=86f46f25d8ff8dc32e1c8cd9b5ab0d285d5c3523;p=mirror_ubuntu-kernels.git 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 Signed-off-by: Rob Clark --- diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index ee44b0f01e90..38b7f4e9e7ff 100644 --- 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; - 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))