diff options
| author | Rob Clark <robdclark@chromium.org> | 2021-11-11 11:24:56 -0800 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2021-11-21 12:51:13 -0800 |
| commit | 067ecab9eef620d41040715669e5fcdc2f8ff963 (patch) | |
| tree | 5979cd41fc12f9e83e8c1fd671661d3a59b630bf /drivers/gpu/drm/msm/msm_gpu.h | |
| parent | ea0006d390a28012f8187717aea61498b2b341e5 (diff) | |
| download | linux-stable-067ecab9eef620d41040715669e5fcdc2f8ff963.tar.gz linux-stable-067ecab9eef620d41040715669e5fcdc2f8ff963.tar.bz2 linux-stable-067ecab9eef620d41040715669e5fcdc2f8ff963.zip | |
drm/msm: Restore error return on invalid fence
When converting to use an idr to map userspace fence seqno values back
to a dma_fence, we lost the error return when userspace passes seqno
that is larger than the last submitted fence. Restore this check.
Reported-by: Akhil P Oommen <akhilpo@codeaurora.org>
Fixes: a61acbbe9cf8 ("drm/msm: Track "seqno" fences by idr")
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Akhil P Oommen <akhilpo@codeaurora.org>
Link: https://lore.kernel.org/r/20211111192457.747899-3-robdclark@gmail.com
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.h')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 59cdd00b69d0..48ea2de911f1 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -359,6 +359,8 @@ static inline int msm_gpu_convert_priority(struct msm_gpu *gpu, int prio, * @ring_nr: the ringbuffer used by this submitqueue, which is determined * by the submitqueue's priority * @faults: the number of GPU hangs associated with this submitqueue + * @last_fence: the sequence number of the last allocated fence (for error + * checking) * @ctx: the per-drm_file context associated with the submitqueue (ie. * which set of pgtables do submits jobs associated with the * submitqueue use) @@ -374,6 +376,7 @@ struct msm_gpu_submitqueue { u32 flags; u32 ring_nr; int faults; + uint32_t last_fence; struct msm_file_private *ctx; struct list_head node; struct idr fence_idr; |