diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-18 15:25:02 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-18 15:25:01 -0800 |
| commit | 17d650383a89b44d66a99dce6da0cac5496242b6 (patch) | |
| tree | 00e0a6385333c1a0e39fb6b2fea46a0f8aa68a0d | |
| parent | c2e3a1a7e7d71919464fba0d6cf1a620aa781e99 (diff) | |
| parent | e90990f5b1edc09520fffcf46df51ef7b194023a (diff) | |
Merge "drm/msm: Set proper GEM address space range for drm mm allocator"
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem_vma.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index d66071672c62..3610c8fca5f3 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -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 diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c index f399d24019e4..a5a768a63858 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -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); |