diff options
| author | Rob Clark <robdclark@chromium.org> | 2021-11-09 21:11:03 +0300 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2021-11-28 20:50:33 +0300 |
| commit | c28e2f2b417ed747bfbc5f900c87f3ec9cc6b25e (patch) | |
| tree | e265a736316036b5e6eed47cfcee9e05b16e87ef /drivers/gpu/drm/msm/msm_perf.c | |
| parent | 1d054c9b8457b56a651109fac21f56f46ccd46b2 (diff) | |
| download | linux-c28e2f2b417ed747bfbc5f900c87f3ec9cc6b25e.tar.xz | |
drm/msm: Remove struct_mutex usage
The remaining struct_mutex usage is just to serialize various gpu
related things (submit/retire/recover/fault/etc), so replace
struct_mutex with gpu->lock.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Link: https://lore.kernel.org/r/20211109181117.591148-4-robdclark@gmail.com
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_perf.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_perf.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c index 3a27153eef08..3d3da79fec2a 100644 --- a/drivers/gpu/drm/msm/msm_perf.c +++ b/drivers/gpu/drm/msm/msm_perf.c @@ -155,9 +155,12 @@ static int perf_open(struct inode *inode, struct file *file) struct msm_gpu *gpu = priv->gpu; int ret = 0; - mutex_lock(&dev->struct_mutex); + if (!gpu) + return -ENODEV; - if (perf->open || !gpu) { + mutex_lock(&gpu->lock); + + if (perf->open) { ret = -EBUSY; goto out; } @@ -171,7 +174,7 @@ static int perf_open(struct inode *inode, struct file *file) perf->next_jiffies = jiffies + SAMPLE_TIME; out: - mutex_unlock(&dev->struct_mutex); + mutex_unlock(&gpu->lock); return ret; } |