diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-25 15:52:15 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-25 15:52:15 -0700 |
| commit | c5685ec0f3941352bad2535c8612058563ff064a (patch) | |
| tree | fdb583ba90bcebfd81e30bf7ea7b3da07017fc07 /drivers/gpu | |
| parent | b8b329161d6e5b54607323c12a225fae48a3ba42 (diff) | |
| parent | 0e42ef24c9816c2ca81160b81af77c58abcc9bf5 (diff) | |
Merge "msm: kgsl: Return mementry only if pending_free is not set"
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/msm/kgsl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c index 50f55abd6db8..b2def8dea954 100644 --- a/drivers/gpu/msm/kgsl.c +++ b/drivers/gpu/msm/kgsl.c @@ -1238,7 +1238,8 @@ kgsl_sharedmem_find(struct kgsl_process_private *private, uint64_t gpuaddr) spin_lock(&private->mem_lock); idr_for_each_entry(&private->mem_idr, entry, id) { if (GPUADDR_IN_MEMDESC(gpuaddr, &entry->memdesc)) { - ret = kgsl_mem_entry_get(entry); + if (!entry->pending_free) + ret = kgsl_mem_entry_get(entry); break; } } |