Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37363bc0 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 30730c7f 2a6c521b

drivers/gpu/drm/nouveau/nouveau_gem.c

+3 −2
Original line number Diff line number Diff line
@@ -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);