diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-19 19:51:41 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-19 19:51:41 +0000 |
| commit | 3f88611cb51be7974faf9d28be1623c3078838e9 (patch) | |
| tree | 35625f09b208aede4ec608d9d5085d82acbd4af8 | |
| parent | ba864dedeef7d3f05b394fdded91c9ca61c99a04 (diff) | |
| parent | 373e505a5c70f648551c8fe205cebf2fd5898dab (diff) | |
| download | gpu-android-gs-shusky-5.15-android15-beta.tar.gz | |
Snap for 11594826 from 373e505a5c70f648551c8fe205cebf2fd5898dab to android14-gs-pixel-5.15-24Q3-releaseandroid-15-beta-1_r0.8android-gs-shusky-5.15-android15-beta
Change-Id: I777eb016e85785516addfeb50927351986bdf268
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>
| -rw-r--r-- | mali_kbase/mali_kbase_mem.c | 11 | ||||
| -rw-r--r-- | mali_kbase/mali_kbase_mem.h | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/mali_kbase/mali_kbase_mem.c b/mali_kbase/mali_kbase_mem.c index c3eb2cc..afc5a30 100644 --- a/mali_kbase/mali_kbase_mem.c +++ b/mali_kbase/mali_kbase_mem.c @@ -526,20 +526,15 @@ int kbase_gpu_munmap(struct kbase_context *kctx, struct kbase_va_region *reg) switch (alloc->imported.user_buf.state) { case KBASE_USER_BUF_STATE_GPU_MAPPED: { alloc->imported.user_buf.current_mapping_usage_count = 0; - 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); + kbase_user_buf_from_gpu_mapped_to_empty(kctx, reg); break; } case KBASE_USER_BUF_STATE_DMA_MAPPED: { - 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); + kbase_user_buf_from_dma_mapped_to_empty(kctx, reg); break; } case KBASE_USER_BUF_STATE_PINNED: { - if (!kbase_mem_phy_alloc_ref_read(alloc)) - kbase_user_buf_from_pinned_to_empty(kctx, reg); + 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 371d788..739c7dc 100644 --- a/mali_kbase/mali_kbase_mem.h +++ b/mali_kbase/mali_kbase_mem.h @@ -589,11 +589,6 @@ int kbase_mem_init(struct kbase_device *kbdev); 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); |