diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2024-01-14 18:23:01 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2024-01-14 18:23:01 -0800 |
| commit | f690a3a090644bd9f9e45cfa3deee5f143e726fb (patch) | |
| tree | 2bb892e534eab7401f82bd4804abf50b1d52596b | |
| parent | 7972945ec034b420be8978e8470350ef526d92eb (diff) | |
| parent | 52fcce85dd9b60e74fdda5360acce6cce621102d (diff) | |
| download | gpu-f690a3a090644bd9f9e45cfa3deee5f143e726fb.tar.gz | |
Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10
SBMerger: 571992243
Change-Id: If2216ffa8b46dbc736ed4347556bf5bf4cba214c
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | mali_kbase/csf/mali_kbase_csf_scheduler.c | 4 | ||||
| -rw-r--r-- | mali_kbase/mali_kbase_mem.c | 2 | ||||
| -rw-r--r-- | mali_kbase/mmu/mali_kbase_mmu_hw_direct.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mali_kbase/csf/mali_kbase_csf_scheduler.c b/mali_kbase/csf/mali_kbase_csf_scheduler.c index 8d0fff6..6dc4c20 100644 --- a/mali_kbase/csf/mali_kbase_csf_scheduler.c +++ b/mali_kbase/csf/mali_kbase_csf_scheduler.c @@ -7351,7 +7351,7 @@ int kbase_csf_scheduler_init(struct kbase_device *kbdev) scheduler->kthread_running = true; scheduler->gpuq_kthread = kbase_kthread_run_rt(kbdev, &kbase_csf_scheduler_kthread, kbdev, "mali-gpuq-kthread"); - if (IS_ERR(scheduler->gpuq_kthread)) { + if (IS_ERR_OR_NULL(scheduler->gpuq_kthread)) { kfree(scheduler->csg_slots); scheduler->csg_slots = NULL; @@ -7440,7 +7440,7 @@ void kbase_csf_scheduler_term(struct kbase_device *kbdev) { struct kbase_csf_scheduler *scheduler = &kbdev->csf.scheduler; - if (scheduler->gpuq_kthread) { + if (!IS_ERR_OR_NULL(scheduler->gpuq_kthread)) { scheduler->kthread_running = false; complete(&scheduler->kthread_signal); kthread_stop(scheduler->gpuq_kthread); diff --git a/mali_kbase/mali_kbase_mem.c b/mali_kbase/mali_kbase_mem.c index a53fff1..afc5a30 100644 --- a/mali_kbase/mali_kbase_mem.c +++ b/mali_kbase/mali_kbase_mem.c @@ -2762,7 +2762,7 @@ static int kbase_jit_grow(struct kbase_context *kctx, const struct base_jit_allo kbase_mem_pool_lock(pool); } - if (reg->gpu_alloc->nents > info->commit_pages) { + if (reg->gpu_alloc->nents >= info->commit_pages) { kbase_mem_pool_unlock(pool); spin_unlock(&kctx->mem_partials_lock); dev_info( diff --git a/mali_kbase/mmu/mali_kbase_mmu_hw_direct.c b/mali_kbase/mmu/mali_kbase_mmu_hw_direct.c index bfe6527..25af427 100644 --- a/mali_kbase/mmu/mali_kbase_mmu_hw_direct.c +++ b/mali_kbase/mmu/mali_kbase_mmu_hw_direct.c @@ -215,7 +215,7 @@ static int write_cmd(struct kbase_device *kbdev, unsigned int as_nr, u32 cmd) #if MALI_USE_CSF static int wait_l2_power_trans_complete(struct kbase_device *kbdev) { - u32 val; + u64 val; const u32 timeout_us = kbase_get_timeout_ms(kbdev, MMU_AS_INACTIVE_WAIT_TIMEOUT) * USEC_PER_MSEC; const int err = kbase_reg_poll64_timeout(kbdev, GPU_CONTROL_ENUM(L2_PWRTRANS), val, |