diff options
| author |   Christian König <christian.koenig@amd.com> | 2021-06-02 13:01:15 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2021-06-06 11:19:51 +0200 |
| commit | d3fae3b3daac09961ab871a25093b0ae404282d5 (patch) | |
| tree | 08af1080c5214e2e541b1306355a14ecd51aa3b2 /drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | |
| parent | dma-buf: rename dma_resv_get_excl_rcu to _unlocked (diff) | |
| download | linux-dev-d3fae3b3daac09961ab871a25093b0ae404282d5.tar.xz linux-dev-d3fae3b3daac09961ab871a25093b0ae404282d5.zip | |
dma-buf: drop the _rcu postfix on function names v3
The functions can be called both in _rcu context as well
as while holding the lock.
v2: add some kerneldoc as suggested by Daniel
v3: fix indentation
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210602111714.212426-7-christian.koenig@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 3267eb2e35dd..6dde2873d47b 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8400,9 +8400,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, * deadlock during GPU reset when this fence will not signal * but we hold reservation lock for the BO. */ - r = dma_resv_wait_timeout_rcu(abo->tbo.base.resv, true, - false, - msecs_to_jiffies(5000)); + r = dma_resv_wait_timeout(abo->tbo.base.resv, true, false, + msecs_to_jiffies(5000)); if (unlikely(r <= 0)) DRM_ERROR("Waiting for fences timed out!"); |