mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

drm/msm: Disallow relocs on a6xx+

Browse source 
Mesa stopped using these pretty early in a6xx bringup[1].  Take advantage
of this to disallow some legacy UABI.

[1] 7ef722861b

Signed-off-by: Rob Clark <robdclark@chromium.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Patchwork: https://patchwork.freedesktop.org/patch/551175/
This commit is contained in:
Rob Clark 2023-08-03 11:32:45 -07:00
parent 3136a0f835
commit 42854f8d2b
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/msm/adreno/adreno_gpu.c
View file

@ -1078,6 +1078,8 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
adreno_gpu->info = config->info;
adreno_gpu->chip_id = config->chip_id;
gpu->allow_relocs = config->info->family < ADRENO_6XX_GEN1;
/* Only handle the core clock when GMU is not in use (or is absent). */
if (adreno_has_gmu_wrapper(adreno_gpu) ||
adreno_gpu->info->family < ADRENO_6XX_GEN1) {

10
drivers/gpu/drm/msm/msm_gem_submit.c
View file

@ -882,6 +882,16 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
if (submit->valid)
continue;
if (!gpu->allow_relocs) {
if (submit->cmd[i].nr_relocs) {
DRM_ERROR("relocs not allowed\n");
ret = -EINVAL;
goto out;
}
continue;
}
ret = submit_reloc(submit, msm_obj, submit->cmd[i].offset * 4,
submit->cmd[i].nr_relocs, submit->cmd[i].relocs);
if (ret)

9
drivers/gpu/drm/msm/msm_gpu.h
View file

@ -285,6 +285,15 @@ struct msm_gpu {
/* True if the hardware supports expanded apriv (a650 and newer) */
bool hw_apriv;
/**
* @allow_relocs: allow relocs in SUBMIT ioctl
*
* Mesa won't use relocs for driver version 1.4.0 and later. This
* switch-over happened early enough in mesa a6xx bringup that we
* can disallow relocs for a6xx and newer.
*/
bool allow_relocs;
struct thermal_cooling_device *cooling;
};