* [PATCH 1/2] radeon: Don't generate new fence for page flip.
@ 2011-07-12 11:39 Michel Dänzer
2011-07-12 11:39 ` [PATCH 2/2] radeon: Don't clobber error return value in page flipping cleanup paths Michel Dänzer
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Michel Dänzer @ 2011-07-12 11:39 UTC (permalink / raw)
To: dri-devel
From: Michel Dänzer <michel.daenzer@amd.com>
Use the fence of the new frontbuffer, if any.
Generating a new fence could cause us to wait for completely unrelated
rendering to finish before performing the flip.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
---
drivers/gpu/drm/radeon/radeon_display.c | 33 ++++--------------------------
1 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 0671934..71a4840 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -280,7 +280,7 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
spin_lock_irqsave(&rdev->ddev->event_lock, flags);
work = radeon_crtc->unpin_work;
if (work == NULL ||
- !radeon_fence_signaled(work->fence)) {
+ (work->fence && !radeon_fence_signaled(work->fence))) {
spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
return;
}
@@ -346,7 +346,6 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
struct radeon_framebuffer *new_radeon_fb;
struct drm_gem_object *obj;
struct radeon_bo *rbo;
- struct radeon_fence *fence;
struct radeon_unpin_work *work;
unsigned long flags;
u32 tiling_flags, pitch_pixels;
@@ -357,22 +356,19 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
if (work == NULL)
return -ENOMEM;
- r = radeon_fence_create(rdev, &fence);
- if (unlikely(r != 0)) {
- kfree(work);
- DRM_ERROR("flip queue: failed to create fence.\n");
- return -ENOMEM;
- }
work->event = event;
work->rdev = rdev;
work->crtc_id = radeon_crtc->crtc_id;
- work->fence = radeon_fence_ref(fence);
old_radeon_fb = to_radeon_framebuffer(crtc->fb);
new_radeon_fb = to_radeon_framebuffer(fb);
/* schedule unpin of the old buffer */
obj = old_radeon_fb->obj;
rbo = gem_to_radeon_bo(obj);
work->old_rbo = rbo;
+ obj = new_radeon_fb->obj;
+ rbo = gem_to_radeon_bo(obj);
+ if (rbo->tbo.sync_obj)
+ work->fence = radeon_fence_ref(rbo->tbo.sync_obj);
INIT_WORK(&work->work, radeon_unpin_work_func);
/* We borrow the event spin lock for protecting unpin_work */
@@ -380,7 +376,6 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
if (radeon_crtc->unpin_work) {
spin_unlock_irqrestore(&dev->event_lock, flags);
kfree(work);
- radeon_fence_unref(&fence);
DRM_DEBUG_DRIVER("flip queue: crtc already busy\n");
return -EBUSY;
@@ -390,9 +385,6 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
spin_unlock_irqrestore(&dev->event_lock, flags);
/* pin the new buffer */
- obj = new_radeon_fb->obj;
- rbo = gem_to_radeon_bo(obj);
-
DRM_DEBUG_DRIVER("flip-ioctl() cur_fbo = %p, cur_bbo = %p\n",
work->old_rbo, rbo);
@@ -460,25 +452,11 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
goto pflip_cleanup1;
}
- /* 32 ought to cover us */
- r = radeon_ring_lock(rdev, 32);
- if (r) {
- DRM_ERROR("failed to lock the ring before flip\n");
- goto pflip_cleanup2;
- }
-
- /* emit the fence */
- radeon_fence_emit(rdev, fence);
/* set the proper interrupt */
radeon_pre_page_flip(rdev, radeon_crtc->crtc_id);
- /* fire the ring */
- radeon_ring_unlock_commit(rdev);
return 0;
-pflip_cleanup2:
- drm_vblank_put(dev, radeon_crtc->crtc_id);
-
pflip_cleanup1:
r = radeon_bo_reserve(rbo, false);
if (unlikely(r != 0)) {
@@ -498,7 +476,6 @@ pflip_cleanup:
spin_lock_irqsave(&dev->event_lock, flags);
radeon_crtc->unpin_work = NULL;
spin_unlock_irqrestore(&dev->event_lock, flags);
- radeon_fence_unref(&fence);
kfree(work);
return r;
--
1.7.5.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] radeon: Don't clobber error return value in page flipping cleanup paths.
2011-07-12 11:39 [PATCH 1/2] radeon: Don't generate new fence for page flip Michel Dänzer
@ 2011-07-12 11:39 ` Michel Dänzer
2011-07-12 14:43 ` Alex Deucher
2011-07-12 14:45 ` [PATCH 1/2] radeon: Don't generate new fence for page flip Alex Deucher
2011-07-13 7:32 ` Dave Airlie
2 siblings, 1 reply; 6+ messages in thread
From: Michel Dänzer @ 2011-07-12 11:39 UTC (permalink / raw)
To: dri-devel
From: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
---
drivers/gpu/drm/radeon/radeon_display.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 71a4840..c2d8d25 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -458,17 +458,12 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
return 0;
pflip_cleanup1:
- r = radeon_bo_reserve(rbo, false);
- if (unlikely(r != 0)) {
+ if (unlikely(radeon_bo_reserve(rbo, false) != 0)) {
DRM_ERROR("failed to reserve new rbo in error path\n");
goto pflip_cleanup;
}
- r = radeon_bo_unpin(rbo);
- if (unlikely(r != 0)) {
- radeon_bo_unreserve(rbo);
- r = -EINVAL;
+ if (unlikely(radeon_bo_unpin(rbo) != 0)) {
DRM_ERROR("failed to unpin new rbo in error path\n");
- goto pflip_cleanup;
}
radeon_bo_unreserve(rbo);
--
1.7.5.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] radeon: Don't clobber error return value in page flipping cleanup paths.
2011-07-12 11:39 ` [PATCH 2/2] radeon: Don't clobber error return value in page flipping cleanup paths Michel Dänzer
@ 2011-07-12 14:43 ` Alex Deucher
0 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2011-07-12 14:43 UTC (permalink / raw)
To: Michel Dänzer; +Cc: dri-devel
2011/7/12 Michel Dänzer <michel@daenzer.net>:
> From: Michel Dänzer <michel.daenzer@amd.com>
>
> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/radeon/radeon_display.c | 9 ++-------
> 1 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
> index 71a4840..c2d8d25 100644
> --- a/drivers/gpu/drm/radeon/radeon_display.c
> +++ b/drivers/gpu/drm/radeon/radeon_display.c
> @@ -458,17 +458,12 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
> return 0;
>
> pflip_cleanup1:
> - r = radeon_bo_reserve(rbo, false);
> - if (unlikely(r != 0)) {
> + if (unlikely(radeon_bo_reserve(rbo, false) != 0)) {
> DRM_ERROR("failed to reserve new rbo in error path\n");
> goto pflip_cleanup;
> }
> - r = radeon_bo_unpin(rbo);
> - if (unlikely(r != 0)) {
> - radeon_bo_unreserve(rbo);
> - r = -EINVAL;
> + if (unlikely(radeon_bo_unpin(rbo) != 0)) {
> DRM_ERROR("failed to unpin new rbo in error path\n");
> - goto pflip_cleanup;
> }
> radeon_bo_unreserve(rbo);
>
> --
> 1.7.5.4
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] radeon: Don't generate new fence for page flip.
2011-07-12 11:39 [PATCH 1/2] radeon: Don't generate new fence for page flip Michel Dänzer
2011-07-12 11:39 ` [PATCH 2/2] radeon: Don't clobber error return value in page flipping cleanup paths Michel Dänzer
@ 2011-07-12 14:45 ` Alex Deucher
2011-07-13 7:32 ` Dave Airlie
2 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2011-07-12 14:45 UTC (permalink / raw)
To: Michel Dänzer; +Cc: dri-devel
2011/7/12 Michel Dänzer <michel@daenzer.net>:
> From: Michel Dänzer <michel.daenzer@amd.com>
>
> Use the fence of the new frontbuffer, if any.
>
> Generating a new fence could cause us to wait for completely unrelated
> rendering to finish before performing the flip.
>
> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/radeon/radeon_display.c | 33 ++++--------------------------
> 1 files changed, 5 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
> index 0671934..71a4840 100644
> --- a/drivers/gpu/drm/radeon/radeon_display.c
> +++ b/drivers/gpu/drm/radeon/radeon_display.c
> @@ -280,7 +280,7 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
> spin_lock_irqsave(&rdev->ddev->event_lock, flags);
> work = radeon_crtc->unpin_work;
> if (work == NULL ||
> - !radeon_fence_signaled(work->fence)) {
> + (work->fence && !radeon_fence_signaled(work->fence))) {
> spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
> return;
> }
> @@ -346,7 +346,6 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
> struct radeon_framebuffer *new_radeon_fb;
> struct drm_gem_object *obj;
> struct radeon_bo *rbo;
> - struct radeon_fence *fence;
> struct radeon_unpin_work *work;
> unsigned long flags;
> u32 tiling_flags, pitch_pixels;
> @@ -357,22 +356,19 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
> if (work == NULL)
> return -ENOMEM;
>
> - r = radeon_fence_create(rdev, &fence);
> - if (unlikely(r != 0)) {
> - kfree(work);
> - DRM_ERROR("flip queue: failed to create fence.\n");
> - return -ENOMEM;
> - }
> work->event = event;
> work->rdev = rdev;
> work->crtc_id = radeon_crtc->crtc_id;
> - work->fence = radeon_fence_ref(fence);
> old_radeon_fb = to_radeon_framebuffer(crtc->fb);
> new_radeon_fb = to_radeon_framebuffer(fb);
> /* schedule unpin of the old buffer */
> obj = old_radeon_fb->obj;
> rbo = gem_to_radeon_bo(obj);
> work->old_rbo = rbo;
> + obj = new_radeon_fb->obj;
> + rbo = gem_to_radeon_bo(obj);
> + if (rbo->tbo.sync_obj)
> + work->fence = radeon_fence_ref(rbo->tbo.sync_obj);
> INIT_WORK(&work->work, radeon_unpin_work_func);
>
> /* We borrow the event spin lock for protecting unpin_work */
> @@ -380,7 +376,6 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
> if (radeon_crtc->unpin_work) {
> spin_unlock_irqrestore(&dev->event_lock, flags);
> kfree(work);
> - radeon_fence_unref(&fence);
>
> DRM_DEBUG_DRIVER("flip queue: crtc already busy\n");
> return -EBUSY;
> @@ -390,9 +385,6 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
> spin_unlock_irqrestore(&dev->event_lock, flags);
>
> /* pin the new buffer */
> - obj = new_radeon_fb->obj;
> - rbo = gem_to_radeon_bo(obj);
> -
> DRM_DEBUG_DRIVER("flip-ioctl() cur_fbo = %p, cur_bbo = %p\n",
> work->old_rbo, rbo);
>
> @@ -460,25 +452,11 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
> goto pflip_cleanup1;
> }
>
> - /* 32 ought to cover us */
> - r = radeon_ring_lock(rdev, 32);
> - if (r) {
> - DRM_ERROR("failed to lock the ring before flip\n");
> - goto pflip_cleanup2;
> - }
> -
> - /* emit the fence */
> - radeon_fence_emit(rdev, fence);
> /* set the proper interrupt */
> radeon_pre_page_flip(rdev, radeon_crtc->crtc_id);
> - /* fire the ring */
> - radeon_ring_unlock_commit(rdev);
>
> return 0;
>
> -pflip_cleanup2:
> - drm_vblank_put(dev, radeon_crtc->crtc_id);
> -
> pflip_cleanup1:
> r = radeon_bo_reserve(rbo, false);
> if (unlikely(r != 0)) {
> @@ -498,7 +476,6 @@ pflip_cleanup:
> spin_lock_irqsave(&dev->event_lock, flags);
> radeon_crtc->unpin_work = NULL;
> spin_unlock_irqrestore(&dev->event_lock, flags);
> - radeon_fence_unref(&fence);
> kfree(work);
>
> return r;
> --
> 1.7.5.4
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] radeon: Don't generate new fence for page flip.
2011-07-12 11:39 [PATCH 1/2] radeon: Don't generate new fence for page flip Michel Dänzer
2011-07-12 11:39 ` [PATCH 2/2] radeon: Don't clobber error return value in page flipping cleanup paths Michel Dänzer
2011-07-12 14:45 ` [PATCH 1/2] radeon: Don't generate new fence for page flip Alex Deucher
@ 2011-07-13 7:32 ` Dave Airlie
2011-07-13 7:40 ` Michel Dänzer
2 siblings, 1 reply; 6+ messages in thread
From: Dave Airlie @ 2011-07-13 7:32 UTC (permalink / raw)
To: Michel Dänzer; +Cc: dri-devel
2011/7/12 Michel Dänzer <michel@daenzer.net>:
> From: Michel Dänzer <michel.daenzer@amd.com>
>
> Use the fence of the new frontbuffer, if any.
What tree is this against, I can't apply it to drm-fixes or drm-core-next here.
Dave.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] radeon: Don't generate new fence for page flip.
2011-07-13 7:32 ` Dave Airlie
@ 2011-07-13 7:40 ` Michel Dänzer
0 siblings, 0 replies; 6+ messages in thread
From: Michel Dänzer @ 2011-07-13 7:40 UTC (permalink / raw)
To: Dave Airlie; +Cc: dri-devel
On Mit, 2011-07-13 at 08:32 +0100, Dave Airlie wrote:
> 2011/7/12 Michel Dänzer <michel@daenzer.net>:
> > From: Michel Dänzer <michel.daenzer@amd.com>
> >
> > Use the fence of the new frontbuffer, if any.
>
> What tree is this against, I can't apply it to drm-fixes or drm-core-next here.
I created it against 2.6.39.y. I'll respin against drm-core-next and
resend.
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Debian, X and DRI developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-13 14:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-12 11:39 [PATCH 1/2] radeon: Don't generate new fence for page flip Michel Dänzer
2011-07-12 11:39 ` [PATCH 2/2] radeon: Don't clobber error return value in page flipping cleanup paths Michel Dänzer
2011-07-12 14:43 ` Alex Deucher
2011-07-12 14:45 ` [PATCH 1/2] radeon: Don't generate new fence for page flip Alex Deucher
2011-07-13 7:32 ` Dave Airlie
2011-07-13 7:40 ` Michel Dänzer
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.