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 17/19] drm/radeon: use rcu waits in some ioctls Date: Thu, 31 Jul 2014 17:34:32 +0200 [thread overview] Message-ID: <20140731153432.15061.49403.stgit@patser> (raw) In-Reply-To: <20140731153245.15061.63023.stgit@patser> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> --- drivers/gpu/drm/radeon/radeon_gem.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index d09650c1d720..7ba883843668 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -107,9 +107,12 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj, } if (domain == RADEON_GEM_DOMAIN_CPU) { /* Asking for cpu access wait for object idle */ - r = radeon_bo_wait(robj, NULL, false); - if (r) { - printk(KERN_ERR "Failed to wait for object !\n"); + r = reservation_object_wait_timeout_rcu(robj->tbo.resv, true, true, 30 * HZ); + if (!r) + r = -EBUSY; + + if (r < 0 && r != -EINTR) { + printk(KERN_ERR "Failed to wait for object: %i\n", r); return r; } } @@ -357,14 +360,20 @@ int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data, struct drm_radeon_gem_wait_idle *args = data; struct drm_gem_object *gobj; struct radeon_bo *robj; - int r; + int r = 0; + long ret; gobj = drm_gem_object_lookup(dev, filp, args->handle); if (gobj == NULL) { return -ENOENT; } robj = gem_to_radeon_bo(gobj); - r = radeon_bo_wait(robj, NULL, false); + ret = reservation_object_wait_timeout_rcu(robj->tbo.resv, true, true, 30 * HZ); + if (ret == 0) + r = -EBUSY; + else if (ret < 0) + r = ret; + /* callback hw specific functions if any */ if (rdev->asic->ioctl_wait_idle) robj->rdev->asic->ioctl_wait_idle(rdev, robj);
WARNING: multiple messages have this Message-ID (diff)
From: Maarten Lankhorst <maarten.lankhorst-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> To: airlied-cv59FeDIM0c@public.gmane.org Cc: thellstrom-pghWNbHTmq7QT0dZR+AlfA@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, alexander.deucher-5C7GfCeVMHo@public.gmane.org, christian.koenig-5C7GfCeVMHo@public.gmane.org Subject: [PATCH 17/19] drm/radeon: use rcu waits in some ioctls Date: Thu, 31 Jul 2014 17:34:32 +0200 [thread overview] Message-ID: <20140731153432.15061.49403.stgit@patser> (raw) In-Reply-To: <20140731153245.15061.63023.stgit@patser> Signed-off-by: Maarten Lankhorst <maarten.lankhorst-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> --- drivers/gpu/drm/radeon/radeon_gem.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index d09650c1d720..7ba883843668 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -107,9 +107,12 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj, } if (domain == RADEON_GEM_DOMAIN_CPU) { /* Asking for cpu access wait for object idle */ - r = radeon_bo_wait(robj, NULL, false); - if (r) { - printk(KERN_ERR "Failed to wait for object !\n"); + r = reservation_object_wait_timeout_rcu(robj->tbo.resv, true, true, 30 * HZ); + if (!r) + r = -EBUSY; + + if (r < 0 && r != -EINTR) { + printk(KERN_ERR "Failed to wait for object: %i\n", r); return r; } } @@ -357,14 +360,20 @@ int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data, struct drm_radeon_gem_wait_idle *args = data; struct drm_gem_object *gobj; struct radeon_bo *robj; - int r; + int r = 0; + long ret; gobj = drm_gem_object_lookup(dev, filp, args->handle); if (gobj == NULL) { return -ENOENT; } robj = gem_to_radeon_bo(gobj); - r = radeon_bo_wait(robj, NULL, false); + ret = reservation_object_wait_timeout_rcu(robj->tbo.resv, true, true, 30 * HZ); + if (ret == 0) + r = -EBUSY; + else if (ret < 0) + r = ret; + /* callback hw specific functions if any */ if (rdev->asic->ioctl_wait_idle) robj->rdev->asic->ioctl_wait_idle(rdev, robj);
next prev parent reply other threads:[~2014-07-31 15:34 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-07-31 15:32 [PATCH 01/19] fence: add debugging lines to fence_is_signaled for the callback Maarten Lankhorst 2014-07-31 15:32 ` Maarten Lankhorst 2014-07-31 15:32 ` [PATCH 02/19] drm/ttm: add interruptible parameter to ttm_eu_reserve_buffers Maarten Lankhorst 2014-07-31 15:32 ` Maarten Lankhorst 2014-07-31 15:33 ` [PATCH 03/19] drm/ttm: kill off some members to ttm_validate_buffer Maarten Lankhorst 2014-07-31 15:33 ` Maarten Lankhorst 2014-07-31 15:33 ` [PATCH 04/19] drm/nouveau: add reservation to nouveau_gem_ioctl_cpu_prep Maarten Lankhorst 2014-07-31 15:33 ` [PATCH 05/19] drm/nouveau: require reservations for nouveau_fence_sync and nouveau_bo_fence Maarten Lankhorst 2014-07-31 15:33 ` [PATCH 06/19] drm/ttm: call ttm_bo_wait while inside a reservation Maarten Lankhorst 2014-07-31 15:33 ` Maarten Lankhorst 2014-07-31 15:33 ` [PATCH 07/19] drm/ttm: kill fence_lock Maarten Lankhorst 2014-07-31 15:33 ` Maarten Lankhorst 2014-07-31 15:33 ` [PATCH 08/19] drm/nouveau: rework to new fence interface Maarten Lankhorst 2014-07-31 15:33 ` Maarten Lankhorst 2014-07-31 15:33 ` [PATCH 09/19] drm/radeon: handle lockup in delayed work, v2 Maarten Lankhorst 2014-07-31 15:33 ` Maarten Lankhorst 2014-08-01 16:35 ` Christian König 2014-08-01 16:35 ` Christian König 2014-08-01 17:46 ` Maarten Lankhorst 2014-08-01 17:46 ` Maarten Lankhorst 2014-08-04 8:36 ` Christian König 2014-08-04 8:36 ` Christian König 2014-08-04 8:55 ` Maarten Lankhorst 2014-08-04 8:55 ` Maarten Lankhorst 2014-08-04 11:57 ` Christian König 2014-08-04 11:57 ` Christian König 2014-08-04 13:34 ` Maarten Lankhorst 2014-08-04 13:34 ` Maarten Lankhorst 2014-08-04 14:37 ` Christian König 2014-08-04 14:37 ` Christian König 2014-08-04 14:40 ` Maarten Lankhorst 2014-08-04 14:40 ` Maarten Lankhorst 2014-08-04 14:45 ` Christian König 2014-08-04 14:45 ` Christian König 2014-08-04 14:58 ` Maarten Lankhorst 2014-08-04 14:58 ` Maarten Lankhorst 2014-08-04 15:04 ` Christian König 2014-08-04 15:04 ` Christian König 2014-08-04 15:09 ` Maarten Lankhorst 2014-08-04 15:09 ` Maarten Lankhorst 2014-08-04 17:04 ` Christian König 2014-08-04 17:04 ` Christian König 2014-08-05 8:16 ` Daniel Vetter 2014-08-05 8:16 ` Daniel Vetter 2014-08-05 9:34 ` Maarten Lankhorst 2014-08-05 9:34 ` Maarten Lankhorst 2014-07-31 15:33 ` [PATCH 10/19] drm/radeon: add timeout argument to radeon_fence_wait_seq Maarten Lankhorst 2014-07-31 15:33 ` Maarten Lankhorst 2014-07-31 15:33 ` [PATCH 11/19] drm/radeon: use common fence implementation for fences, v2 Maarten Lankhorst 2014-07-31 15:34 ` [PATCH 12/19] drm/qxl: rework to new fence interface Maarten Lankhorst 2014-07-31 15:34 ` Maarten Lankhorst 2014-07-31 15:34 ` [PATCH 13/19] drm/vmwgfx: get rid of different types of fence_flags entirely Maarten Lankhorst 2014-07-31 15:34 ` Maarten Lankhorst 2014-07-31 15:34 ` [PATCH 14/19] drm/vmwgfx: rework to new fence interface Maarten Lankhorst 2014-07-31 15:34 ` Maarten Lankhorst 2014-07-31 15:34 ` [PATCH 15/19] drm/ttm: flip the switch, and convert to dma_fence Maarten Lankhorst 2014-07-31 15:34 ` [PATCH 16/19] drm/nouveau: use rcu in nouveau_gem_ioctl_cpu_prep Maarten Lankhorst 2014-07-31 15:34 ` Maarten Lankhorst [this message] 2014-07-31 15:34 ` [PATCH 17/19] drm/radeon: use rcu waits in some ioctls Maarten Lankhorst 2014-08-01 8:27 ` Michel Dänzer 2014-08-01 10:12 ` Maarten Lankhorst 2014-08-01 14:13 ` Michel Dänzer 2014-08-01 17:07 ` Maarten Lankhorst 2014-08-04 8:42 ` Michel Dänzer 2014-08-04 8:56 ` Maarten Lankhorst 2014-08-04 9:25 ` Michel Dänzer 2014-08-04 9:30 ` Maarten Lankhorst 2014-07-31 15:34 ` [PATCH 18/19] drm/vmwgfx: use rcu in vmw_user_dmabuf_synccpu_grab Maarten Lankhorst 2014-07-31 15:34 ` [PATCH 19/19] drm/ttm: use rcu in core ttm Maarten Lankhorst
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=20140731153432.15061.49403.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.