android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: kgsl: Fix static checker warnings"

Browse Source
This commit is contained in:
qctecmdr 2022-11-25 10:35:11 -08:00 committed by Gerrit - the friendly Code Review server
commit 2f768b8d5e
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/msm/adreno_a6xx_hwsched_hfi.c
View File

@ -1485,7 +1485,7 @@ static int send_context_pointers(struct adreno_device *adreno_dev,
struct kgsl_context *context)
{
struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
struct hfi_context_pointers_cmd cmd;
struct hfi_context_pointers_cmd cmd = {0};
int ret;
ret = CMD_MSG_HDR(cmd, H2F_MSG_CONTEXT_POINTERS);
@ -1498,8 +1498,6 @@ static int send_context_pointers(struct adreno_device *adreno_dev,
if (context->user_ctxt_record)
cmd.user_ctxt_record_addr =
context->user_ctxt_record->memdesc.gpuaddr;
else
cmd.user_ctxt_record_addr = 0;
return a6xx_hfi_send_cmd_async(adreno_dev, &cmd);
}

3
drivers/gpu/msm/adreno_gen7_gmu.c
View File

@ -1045,7 +1045,8 @@ static int _map_gmu_dynamic(struct gen7_gmu_device *gmu,
spin_lock(&vma->lock);
vma_node = find_va(vma, md->gmuaddr, md->size);
rb_erase(&vma_node->node, &vma->vma_root);
if (vma_node)
rb_erase(&vma_node->node, &vma->vma_root);
spin_unlock(&vma->lock);
kfree(vma_node);

4
drivers/gpu/msm/adreno_gen7_hwsched_hfi.c
View File

@ -1760,7 +1760,7 @@ static int send_context_pointers(struct adreno_device *adreno_dev,
struct kgsl_context *context)
{
struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
struct hfi_context_pointers_cmd cmd;
struct hfi_context_pointers_cmd cmd = {0};
struct adreno_context *drawctxt = ADRENO_CONTEXT(context);
int ret;
@ -1774,8 +1774,6 @@ static int send_context_pointers(struct adreno_device *adreno_dev,
if (context->user_ctxt_record)
cmd.user_ctxt_record_addr =
context->user_ctxt_record->memdesc.gpuaddr;
else
cmd.user_ctxt_record_addr = 0;
if (adreno_hwsched_context_queue_enabled(adreno_dev))
cmd.gmu_context_queue_addr = drawctxt->gmu_context_queue.gmuaddr;

4
drivers/gpu/msm/adreno_hwsched.c
View File

@ -1725,10 +1725,10 @@ static void adreno_hwsched_reset_and_snapshot(struct adreno_device *adreno_dev,
if (drawobj) {
force_retire_timestamp(device, drawobj);
if ((context->flags & KGSL_CONTEXT_INVALIDATE_ON_FAULT) ||
if (context && ((context->flags & KGSL_CONTEXT_INVALIDATE_ON_FAULT) ||
(context->flags & KGSL_CONTEXT_NO_FAULT_TOLERANCE) ||
(cmd->error == GMU_GPU_SW_HANG) ||
context_is_throttled(device, context))
context_is_throttled(device, context)))
adreno_drawctxt_set_guilty(device, context);
/*
* Put back the reference which we incremented while trying to find