Skip to content

Commit 73b7e48

Browse files
author
Rob Clark
committed
drm/msm: Reject MAP_NULL op if no PRR
We need PRR support in order to implement MAP_NULL. Userspace shouldn't be trying to use this if it is unsupported. Reported-by: Valentine Burley <valentine.burley@collabora.com> Link: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37935#note_3153730 Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com> Tested-by: Valentine Burley <valentine.burley@collabora.com> Patchwork: https://patchwork.freedesktop.org/patch/682941/ Message-ID: <20251022222051.10030-1-robin.clark@oss.qualcomm.com>
1 parent 7f9335f commit 73b7e48

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

drivers/gpu/drm/msm/adreno/adreno_gpu.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -348,13 +348,6 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags,
348348
return 0;
349349
}
350350

351-
static bool
352-
adreno_smmu_has_prr(struct msm_gpu *gpu)
353-
{
354-
struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(&gpu->pdev->dev);
355-
return adreno_smmu && adreno_smmu->set_prr_addr;
356-
}
357-
358351
int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx,
359352
uint32_t param, uint64_t *value, uint32_t *len)
360353
{

drivers/gpu/drm/msm/msm_gem_vma.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -964,6 +964,7 @@ static int
964964
lookup_op(struct msm_vm_bind_job *job, const struct drm_msm_vm_bind_op *op)
965965
{
966966
struct drm_device *dev = job->vm->drm;
967+
struct msm_drm_private *priv = dev->dev_private;
967968
int i = job->nr_ops++;
968969
int ret = 0;
969970

@@ -1010,6 +1011,11 @@ lookup_op(struct msm_vm_bind_job *job, const struct drm_msm_vm_bind_op *op)
10101011
break;
10111012
}
10121013

1014+
if ((op->op == MSM_VM_BIND_OP_MAP_NULL) &&
1015+
!adreno_smmu_has_prr(priv->gpu)) {
1016+
ret = UERR(EINVAL, dev, "PRR not supported\n");
1017+
}
1018+
10131019
return ret;
10141020
}
10151021

drivers/gpu/drm/msm/msm_gpu.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,17 @@ static inline struct msm_gpu *dev_to_gpu(struct device *dev)
299299
return container_of(adreno_smmu, struct msm_gpu, adreno_smmu);
300300
}
301301

302+
static inline bool
303+
adreno_smmu_has_prr(struct msm_gpu *gpu)
304+
{
305+
struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(&gpu->pdev->dev);
306+
307+
if (!adreno_smmu)
308+
return false;
309+
310+
return adreno_smmu && adreno_smmu->set_prr_addr;
311+
}
312+
302313
/* It turns out that all targets use the same ringbuffer size */
303314
#define MSM_GPU_RINGBUFFER_SZ SZ_32K
304315
#define MSM_GPU_RINGBUFFER_BLKSIZE 32

0 commit comments

Comments
 (0)