diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2024-03-25 02:34:41 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2024-03-25 02:34:40 -0700 |
| commit | 4ce0e4a8d89f1df7a9fb1d7025543a743b244a23 (patch) | |
| tree | c90cfa1718f192d5787bd02e064bc8a7d46b10a3 | |
| parent | b26c6031c572601ef1842d25673ad96d1207c84d (diff) | |
| parent | 68986d764b2435b494b94ed7e8a6abea6f90f2c4 (diff) | |
Merge "msm: kgsl: Do not release dma and anon buffers if unmap fails"
| -rw-r--r-- | drivers/gpu/msm/kgsl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c index bc0a9fd27e5b..d68cafad86ee 100644 --- a/drivers/gpu/msm/kgsl.c +++ b/drivers/gpu/msm/kgsl.c @@ -277,6 +277,9 @@ static void kgsl_destroy_ion(struct kgsl_memdesc *memdesc) struct kgsl_mem_entry, memdesc); struct kgsl_dma_buf_meta *meta = entry->priv_data; + if (memdesc->priv & KGSL_MEMDESC_MAPPED) + return; + if (meta != NULL) { dma_buf_unmap_attachment(meta->attach, meta->table, DMA_FROM_DEVICE); @@ -304,6 +307,9 @@ static void kgsl_destroy_anon(struct kgsl_memdesc *memdesc) struct scatterlist *sg; struct page *page; + if (memdesc->priv & KGSL_MEMDESC_MAPPED) + return; + for_each_sg(memdesc->sgt->sgl, sg, memdesc->sgt->nents, i) { page = sg_page(sg); for (j = 0; j < (sg->length >> PAGE_SHIFT); j++) { |