[PATCH] drm/msm: Fix null pointer dereferences without iommu

[Luca Weiss]

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

Fixes: bc2112583a0b ("drm/msm/gpu: Track global faults per address-space")
Signed-off-by: Luca Weiss <l...@z3ntu.xyz>
---
 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 ++++-
 drivers/gpu/drm/msm/msm_gpu.c           | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c 
b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 9efc84929be0..1219f71629a5 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -272,7 +272,10 @@ int adreno_get_param(struct msm_gpu *gpu, struct 
msm_file_private *ctx,
                *value = 0;
                return 0;
        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;
        case MSM_PARAM_SUSPENDS:
                *value = gpu->suspend_count;
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index faf0c242874e..58eb3e1662cb 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -371,7 +371,8 @@ static void recover_worker(struct kthread_work *work)
 
                /* Increment the fault counts */
                submit->queue->faults++;
-               submit->aspace->faults++;
+               if (submit->aspace)
+                       submit->aspace->faults++;
 
                task = get_pid_task(submit->pid, PIDTYPE_PID);
                if (task) {
-- 
2.36.0