leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/msm: Fix null pointer dereferences without iommu

Browse Source 
Check if 'aspace' is set before using it as it will stay null without
IOMMU, such as on msm8974.

Fixes: bc2112583a ("drm/msm/gpu: Track global faults per address-space")
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Link: https://lore.kernel.org/r/20220421203455.313523-1-luca@z3ntu.xyz
Signed-off-by: Rob Clark <robdclark@chromium.org>
This commit is contained in:
Luca Weiss 2022-04-21 22:34:53 +02:00 committed by Rob Clark
parent f1fc2b87de
commit 36a1d1bda7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/msm/adreno/adreno_gpu.c
View File

@ -276,7 +276,10 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx,
*value = 0; *value = 0;
return 0; return 0;
case MSM_PARAM_FAULTS: case MSM_PARAM_FAULTS:
*value = gpu->global_faults + ctx->aspace->faults; if (ctx->aspace)
*value = gpu->global_faults + ctx->aspace->faults;
else
*value = gpu->global_faults;
return 0; return 0;
case MSM_PARAM_SUSPENDS: case MSM_PARAM_SUSPENDS:
*value = gpu->suspend_count; *value = gpu->suspend_count;

3
drivers/gpu/drm/msm/msm_gpu.c
View File

@ -391,7 +391,8 @@ static void recover_worker(struct kthread_work *work)
if (submit) { if (submit) {
/* Increment the fault counts */ /* Increment the fault counts */
submit->queue->faults++; submit->queue->faults++;
submit->aspace->faults++; if (submit->aspace)
submit->aspace->faults++;
get_comm_cmdline(submit, &comm, &cmd); get_comm_cmdline(submit, &comm, &cmd);