GPUCORE-41458
Bug: 329096276
Provenance: https://code.ipdelivery.arm.com/c/GPU/mali-ddk/+/6509
Change-Id: Ib283b858b8622380d876b00f9d743e8375f82627
Signed-off-by: Michael Stokes <mjstokes@google.com>
diff --git a/mali_kbase/mali_kbase_mem.c b/mali_kbase/mali_kbase_mem.c
index afc5a30..c3eb2cc 100644
--- a/mali_kbase/mali_kbase_mem.c
+++ b/mali_kbase/mali_kbase_mem.c
@@ -526,15 +526,20 @@
switch (alloc->imported.user_buf.state) {
case KBASE_USER_BUF_STATE_GPU_MAPPED: {
alloc->imported.user_buf.current_mapping_usage_count = 0;
- kbase_user_buf_from_gpu_mapped_to_empty(kctx, reg);
+ kbase_mem_phy_alloc_ref_read(alloc) ?
+ kbase_user_buf_from_gpu_mapped_to_pinned(kctx, reg) :
+ kbase_user_buf_from_gpu_mapped_to_empty(kctx, reg);
break;
}
case KBASE_USER_BUF_STATE_DMA_MAPPED: {
- kbase_user_buf_from_dma_mapped_to_empty(kctx, reg);
+ kbase_mem_phy_alloc_ref_read(alloc) ?
+ kbase_user_buf_from_dma_mapped_to_pinned(kctx, reg) :
+ kbase_user_buf_from_dma_mapped_to_empty(kctx, reg);
break;
}
case KBASE_USER_BUF_STATE_PINNED: {
- kbase_user_buf_from_pinned_to_empty(kctx, reg);
+ if (!kbase_mem_phy_alloc_ref_read(alloc))
+ kbase_user_buf_from_pinned_to_empty(kctx, reg);
break;
}
case KBASE_USER_BUF_STATE_EMPTY: {
diff --git a/mali_kbase/mali_kbase_mem.h b/mali_kbase/mali_kbase_mem.h
index 739c7dc..371d788 100644
--- a/mali_kbase/mali_kbase_mem.h
+++ b/mali_kbase/mali_kbase_mem.h
@@ -589,6 +589,11 @@
void kbase_mem_halt(struct kbase_device *kbdev);
void kbase_mem_term(struct kbase_device *kbdev);
+static inline unsigned int kbase_mem_phy_alloc_ref_read(struct kbase_mem_phy_alloc *alloc)
+{
+ return kref_read(&alloc->kref);
+}
+
static inline struct kbase_mem_phy_alloc *kbase_mem_phy_alloc_get(struct kbase_mem_phy_alloc *alloc)
{
kref_get(&alloc->kref);
