Merge branch 'linux-4.3' of git://anongit.freedesktop.org/nouveau/linux-2.6 into drm-fixes

Just one fix from Ilia to resolve various issues that have resulted from
buffer eviction.

* 'linux-4.3' of git://anongit.freedesktop.org/nouveau/linux-2.6:
  drm/nouveau/gem: return only valid domain when there's only one

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 2c9981512d27..41be584147b9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -227,11 +227,12 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem,
         struct nouveau_bo *nvbo = nouveau_gem_object(gem);
         struct nvkm_vma *vma;
 
-        if (nvbo->bo.mem.mem_type == TTM_PL_TT)
+        if (is_power_of_2(nvbo->valid_domains))
+                rep->domain = nvbo->valid_domains;
+        else if (nvbo->bo.mem.mem_type == TTM_PL_TT)
                 rep->domain = NOUVEAU_GEM_DOMAIN_GART;
         else
                 rep->domain = NOUVEAU_GEM_DOMAIN_VRAM;
-
         rep->offset = nvbo->bo.offset;
         if (cli->vm) {
                 vma = nouveau_bo_vma_find(nvbo, cli->vm);