diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-01-20 07:49:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-01-20 07:49:01 +1000 |
| commit | fc70e13dd1a643565b7628dbe5b130c260a52cf8 (patch) | |
| tree | 2e039735175d000d66dcefaa0decd7d1ef4e8e4f /drivers/gpu/drm/msm/msm_gpu.h | |
| parent | 5dc4c995db9eb45f6373a956eb1f69460e69e6d4 (diff) | |
| parent | a66f1efcf748febea7758c4c3c8b5bc5294949ef (diff) | |
| download | linux-stable-fc70e13dd1a643565b7628dbe5b130c260a52cf8.tar.gz linux-stable-fc70e13dd1a643565b7628dbe5b130c260a52cf8.tar.bz2 linux-stable-fc70e13dd1a643565b7628dbe5b130c260a52cf8.zip | |
Merge tag 'drm-msm-fixes-2023-01-16' of https://gitlab.freedesktop.org/drm/msm into drm-fixes
msm-fixes for v6.3-rc5
Two GPU fixes which were meant to be part of the previous pull request,
but I'd forgotten to fetch from gitlab after the MR was merged so that
git tag was applied to the wrong commit.
- kexec shutdown fix
- fix potential double free
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGskguoVsz2wqAK2k+f32LwcVY5JC6+e2RwLqZswz3RY2Q@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.h')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 651786bc55e5..732295e25683 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -376,10 +376,18 @@ struct msm_file_private { */ int sysprof; - /** comm: Overridden task comm, see MSM_PARAM_COMM */ + /** + * comm: Overridden task comm, see MSM_PARAM_COMM + * + * Accessed under msm_gpu::lock + */ char *comm; - /** cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE */ + /** + * cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE + * + * Accessed under msm_gpu::lock + */ char *cmdline; /** |