diff options
| author | Daniel Vetter <[email protected]> | 2020-12-14 17:16:22 +0000 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2020-12-16 10:28:34 +0000 |
| commit | 8ccf0a29af75326fb8e5ed6e51ff61e74b7ed2e4 (patch) | |
| tree | db0563b230c1ec4f7248fcc88a28f00cd1f3a8d5 | |
| parent | dma-buf: some kerneldoc formatting fixes (diff) | |
| download | kernel-8ccf0a29af75326fb8e5ed6e51ff61e74b7ed2e4.tar.gz kernel-8ccf0a29af75326fb8e5ed6e51ff61e74b7ed2e4.zip | |
dma-buf: begin/end_cpu might lock the dma_resv lock
At least amdgpu and i915 do, so lets just document this as the rule.
v2: Works better with less typos (intel-gfx-ci)
Reviewed-by: Christian König <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
| -rw-r--r-- | drivers/dma-buf/dma-buf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index e1fa6c6f02c4..a0a02ef888da 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -1118,6 +1118,8 @@ int dma_buf_begin_cpu_access(struct dma_buf *dmabuf, if (WARN_ON(!dmabuf)) return -EINVAL; + might_lock(&dmabuf->resv->lock.base); + if (dmabuf->ops->begin_cpu_access) ret = dmabuf->ops->begin_cpu_access(dmabuf, direction); @@ -1151,6 +1153,8 @@ int dma_buf_end_cpu_access(struct dma_buf *dmabuf, WARN_ON(!dmabuf); + might_lock(&dmabuf->resv->lock.base); + if (dmabuf->ops->end_cpu_access) ret = dmabuf->ops->end_cpu_access(dmabuf, direction); |