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

Commit 17d65038 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: Set proper GEM address space range for drm mm allocator"

parents c2e3a1a7 e90990f5

drivers/gpu/drm/msm/msm_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ int msm_gem_get_iova(struct drm_gem_object *obj, 
		obj_remove_domain(domain);



	mutex_unlock(&msm_obj->lock);

	return 0;

	return ret;

}



/* get iova without taking a reference, used in places where you have

drivers/gpu/drm/msm/msm_gem_vma.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ msm_gem_address_space_new(struct msm_mmu *mmu, const char *name, 


	if (aspace->va_len)

		drm_mm_init(&aspace->mm, (start >> PAGE_SHIFT),

			(end >> PAGE_SHIFT) - 1);

			(aspace->va_len >> PAGE_SHIFT));



	kref_init(&aspace->kref);