From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
To: airlied@linux.ie
Cc: thellstrom@vmware.com, nouveau@lists.freedesktop.org,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
bskeggs@redhat.com, alexander.deucher@amd.com,
christian.koenig@amd.com
Subject: [PATCH 04/17] drm/nouveau: require reservations for nouveau_fence_sync and nouveau_bo_fence
Date: Wed, 09 Jul 2014 14:29:24 +0200 [thread overview]
Message-ID: <20140709122924.11354.52022.stgit@patser> (raw)
In-Reply-To: <20140709093124.11354.3774.stgit@patser>
This will ensure we always hold the required lock when calling those functions.
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 2 ++
drivers/gpu/drm/nouveau/nouveau_display.c | 17 +++++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index b6dc85c614be..33eb7164525a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1431,6 +1431,8 @@ nouveau_bo_fence(struct nouveau_bo *nvbo, struct nouveau_fence *fence)
struct nouveau_fence *new_fence = nouveau_fence_ref(fence);
struct nouveau_fence *old_fence = NULL;
+ lockdep_assert_held(&nvbo->bo.resv->lock.base);
+
spin_lock(&nvbo->bo.bdev->fence_lock);
old_fence = nvbo->bo.sync_obj;
nvbo->bo.sync_obj = new_fence;
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 47ad74255bf1..826b66c44235 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -716,6 +716,9 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
}
mutex_lock(&chan->cli->mutex);
+ ret = ttm_bo_reserve(&new_bo->bo, true, false, false, NULL);
+ if (ret)
+ goto fail_unpin;
/* synchronise rendering channel with the kernel's channel */
spin_lock(&new_bo->bo.bdev->fence_lock);
@@ -723,12 +726,18 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
spin_unlock(&new_bo->bo.bdev->fence_lock);
ret = nouveau_fence_sync(fence, chan);
nouveau_fence_unref(&fence);
- if (ret)
+ if (ret) {
+ ttm_bo_unreserve(&new_bo->bo);
goto fail_unpin;
+ }
- ret = ttm_bo_reserve(&old_bo->bo, true, false, false, NULL);
- if (ret)
- goto fail_unpin;
+ if (new_bo != old_bo) {
+ ttm_bo_unreserve(&new_bo->bo);
+
+ ret = ttm_bo_reserve(&old_bo->bo, true, false, false, NULL);
+ if (ret)
+ goto fail_unpin;
+ }
/* Initialize a page flip struct */
*s = (struct nouveau_page_flip_state)
next prev parent reply other threads:[~2014-07-09 12:29 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-09 12:29 [PATCH 00/17] Convert TTM to the new fence interface Maarten Lankhorst
2014-07-09 12:29 ` [PATCH 01/17] drm/ttm: add interruptible parameter to ttm_eu_reserve_buffers Maarten Lankhorst
2014-07-09 12:29 ` [PATCH 02/17] drm/ttm: kill off some members to ttm_validate_buffer Maarten Lankhorst
2014-07-09 12:29 ` [PATCH 03/17] drm/nouveau: add reservation to nouveau_gem_ioctl_cpu_prep Maarten Lankhorst
2014-07-09 12:29 ` Maarten Lankhorst [this message]
2014-07-09 12:29 ` [PATCH 05/17] drm/ttm: call ttm_bo_wait while inside a reservation Maarten Lankhorst
2014-07-09 12:29 ` [PATCH 06/17] drm/ttm: kill fence_lock Maarten Lankhorst
2014-07-09 12:29 ` [PATCH 07/17] drm/nouveau: rework to new fence interface Maarten Lankhorst
2014-07-09 12:29 ` [PATCH 08/17] drm/radeon: add timeout argument to radeon_fence_wait_seq Maarten Lankhorst
2014-07-09 12:29 ` [PATCH 09/17] drm/radeon: use common fence implementation for fences Maarten Lankhorst
2014-07-09 12:57 ` Deucher, Alexander
2014-07-09 13:23 ` [PATCH v2 " Maarten Lankhorst
2014-07-10 17:27 ` Alex Deucher
2014-07-22 4:05 ` [PATCH " Dave Airlie
2014-07-22 8:43 ` Christian König
2014-07-22 11:46 ` Daniel Vetter
2014-07-22 11:52 ` Daniel Vetter
2014-07-22 11:57 ` Daniel Vetter
2014-07-22 12:19 ` Christian König
2014-07-22 13:26 ` [Nouveau] " Daniel Vetter
2014-07-22 13:45 ` Christian König
2014-07-22 14:44 ` Maarten Lankhorst
2014-07-22 15:02 ` Christian König
2014-07-22 15:18 ` Maarten Lankhorst
2014-07-22 15:17 ` Daniel Vetter
2014-07-22 15:35 ` Christian König
2014-07-22 15:42 ` Daniel Vetter
2014-07-22 15:59 ` Christian König
2014-07-22 16:21 ` Daniel Vetter
2014-07-22 16:39 ` Christian König
2014-07-22 16:52 ` Daniel Vetter
2014-07-22 16:43 ` Daniel Vetter
2014-07-23 6:40 ` Maarten Lankhorst
2014-07-23 6:52 ` Christian König
2014-07-23 7:02 ` Daniel Vetter
2014-07-23 7:06 ` Maarten Lankhorst
2014-07-23 7:09 ` Daniel Vetter
2014-07-23 7:15 ` Christian König
2014-07-23 7:32 ` Maarten Lankhorst
2014-07-23 7:41 ` Christian König
2014-07-23 7:26 ` Christian König
2014-07-23 7:31 ` Daniel Vetter
2014-07-23 7:37 ` Christian König
2014-07-23 7:51 ` Maarten Lankhorst
2014-07-23 7:58 ` Christian König
2014-07-23 8:07 ` Daniel Vetter
2014-07-23 8:20 ` Christian König
2014-07-23 8:25 ` Maarten Lankhorst
2014-07-23 8:42 ` Daniel Vetter
2014-07-23 8:46 ` Christian König
2014-07-23 8:54 ` Daniel Vetter
2014-07-23 9:27 ` Christian König
2014-07-23 9:30 ` Daniel Vetter
2014-07-23 9:36 ` Christian König
2014-07-23 9:38 ` Maarten Lankhorst
2014-07-23 9:39 ` Christian König
2014-07-23 9:39 ` Daniel Vetter
2014-07-23 9:44 ` Daniel Vetter
2014-07-23 9:47 ` Christian König
2014-07-23 9:52 ` Daniel Vetter
2014-07-23 9:55 ` Maarten Lankhorst
2014-07-23 10:13 ` Christian König
2014-07-23 10:52 ` Daniel Vetter
2014-07-23 12:36 ` Christian König
2014-07-23 12:42 ` Daniel Vetter
2014-07-23 13:16 ` Maarten Lankhorst
2014-07-23 14:05 ` Maarten Lankhorst
2014-07-24 13:47 ` Christian König
2014-07-23 8:01 ` Daniel Vetter
2014-07-23 8:31 ` Christian König
2014-07-23 12:35 ` Rob Clark
2014-07-22 14:05 ` Maarten Lankhorst
2014-07-22 14:24 ` Christian König
2014-07-22 14:27 ` Maarten Lankhorst
2014-07-22 14:39 ` Christian König
2014-07-22 14:47 ` Maarten Lankhorst
2014-07-22 15:16 ` Christian König
2014-07-22 15:19 ` Daniel Vetter
2014-07-22 15:42 ` Alex Deucher
2014-07-22 15:48 ` Daniel Vetter
2014-07-22 19:14 ` Jesse Barnes
2014-07-23 9:47 ` [Nouveau] " Daniel Vetter
2014-07-23 15:37 ` Jesse Barnes
2014-07-22 11:51 ` Maarten Lankhorst
2014-07-09 12:29 ` [PATCH 10/17] drm/qxl: rework to new fence interface Maarten Lankhorst
2014-07-09 12:30 ` [PATCH 11/17] drm/vmwgfx: get rid of different types of fence_flags entirely Maarten Lankhorst
2014-07-09 12:30 ` [PATCH 12/17] drm/vmwgfx: rework to new fence interface Maarten Lankhorst
2014-07-09 12:30 ` [PATCH 13/17] drm/ttm: flip the switch, and convert to dma_fence Maarten Lankhorst
2014-07-09 12:30 ` [PATCH 14/17] drm/nouveau: use rcu in nouveau_gem_ioctl_cpu_prep Maarten Lankhorst
2014-07-09 12:30 ` [PATCH 15/17] drm/radeon: use rcu waits in some ioctls Maarten Lankhorst
2014-07-09 12:30 ` [PATCH 16/17] drm/vmwgfx: use rcu in vmw_user_dmabuf_synccpu_grab Maarten Lankhorst
2014-07-09 12:30 ` [PATCH 17/17] drm/ttm: use rcu in core ttm Maarten Lankhorst
[not found] ` <CAHbf0-HaFi0px7QGfBErKenH7wDU08B5mxo_QhFJdDPC4WBDrQ@mail.gmail.com>
2014-07-09 13:21 ` [PATCH 00/17] Convert TTM to the new fence interface Maarten Lankhorst
2014-07-10 21:37 ` Thomas Hellström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140709122924.11354.52022.stgit@patser \
--to=maarten.lankhorst@canonical.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=bskeggs@redhat.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=thellstrom@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).