[PATCH] drm/radeon/kms: drop lock in return path of radeon_fence_count_emitted.

[PATCH] drm/radeon/kms: drop lock in return path of radeon_fence_count_emitted.

[Dave Airlie]

From: Dave Airlie <airlied@redhat.com>

Reported-by: Mikko Vinni
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/radeon/radeon_fence.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 64ea3dd..4bd36a3 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -364,8 +364,10 @@ int radeon_fence_count_emitted(struct radeon_device *rdev, int ring)
 	int not_processed = 0;
 
 	read_lock_irqsave(&rdev->fence_lock, irq_flags);
-	if (!rdev->fence_drv[ring].initialized)
+	if (!rdev->fence_drv[ring].initialized) {
+		read_unlock_irqrestore(&rdev->fence_lock, irq_flags);
 		return 0;
+	}
 
 	if (!list_empty(&rdev->fence_drv[ring].emitted)) {
 		struct list_head *ptr;
-- 
1.7.7.6

Re: [PATCH] drm/radeon/kms: drop lock in return path of radeon_fence_count_emitted.

[Alex Deucher]

On Mon, Feb 13, 2012 at 7:18 AM, Dave Airlie <airlied@gmail.com> wrote:
> From: Dave Airlie <airlied@redhat.com>
>
> Reported-by: Mikko Vinni
> Signed-off-by: Dave Airlie <airlied@redhat.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/radeon/radeon_fence.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
> index 64ea3dd..4bd36a3 100644
> --- a/drivers/gpu/drm/radeon/radeon_fence.c
> +++ b/drivers/gpu/drm/radeon/radeon_fence.c
> @@ -364,8 +364,10 @@ int radeon_fence_count_emitted(struct radeon_device *rdev, int ring)
>        int not_processed = 0;
>
>        read_lock_irqsave(&rdev->fence_lock, irq_flags);
> -       if (!rdev->fence_drv[ring].initialized)
> +       if (!rdev->fence_drv[ring].initialized) {
> +               read_unlock_irqrestore(&rdev->fence_lock, irq_flags);
>                return 0;
> +       }
>
>        if (!list_empty(&rdev->fence_drv[ring].emitted)) {
>                struct list_head *ptr;
> --
> 1.7.7.6
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel