diff options
| author | Varad Gautam <varadgautam@google.com> | 2023-07-18 16:52:30 +0000 |
|---|---|---|
| committer | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-07-19 19:01:30 +0000 |
| commit | da3d8b53dfa57c19797a2221ec3fdef154fd2c31 (patch) | |
| tree | f8a45af93abcabc44713a8cc640462ade9fc4b8f /mali_kbase | |
| parent | 4a36254e53bf7b24577ff81f78b76128e65b16f4 (diff) | |
| download | gpu-da3d8b53dfa57c19797a2221ec3fdef154fd2c31.tar.gz | |
csf: Setup kcpu_fence->metadata before accessing it
This restores kbase fence tracepoint operation.
Bug: 291242575
Test: b/291242575#comment12
Change-Id: I3cebd8118373b6cc43b28298955d108b2b85d505
Signed-off-by: Varad Gautam <varadgautam@google.com>
ARM upstream: Available r44p0 onwards b/291902034#comment2
Diffstat (limited to 'mali_kbase')
| -rw-r--r-- | mali_kbase/csf/mali_kbase_csf_kcpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mali_kbase/csf/mali_kbase_csf_kcpu.c b/mali_kbase/csf/mali_kbase_csf_kcpu.c index b87b255..6cb6733 100644 --- a/mali_kbase/csf/mali_kbase_csf_kcpu.c +++ b/mali_kbase/csf/mali_kbase_csf_kcpu.c @@ -1611,6 +1611,8 @@ static int kbasep_kcpu_fence_signal_init(struct kbase_kcpu_command_queue *kcpu_q kcpu_fence = kzalloc(sizeof(*kcpu_fence), GFP_KERNEL); if (!kcpu_fence) return -ENOMEM; + /* Set reference to KCPU metadata */ + kcpu_fence->metadata = kcpu_queue->metadata; #if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) fence_out = (struct fence *)kcpu_fence; @@ -1633,8 +1635,6 @@ static int kbasep_kcpu_fence_signal_init(struct kbase_kcpu_command_queue *kcpu_q dma_fence_get(fence_out); #endif - /* Set reference to KCPU metadata and increment refcount */ - kcpu_fence->metadata = kcpu_queue->metadata; WARN_ON(!kbase_refcount_inc_not_zero(&kcpu_fence->metadata->refcount)); /* create a sync_file fd representing the fence */ |