dri-devel Archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/radeon: do not continue after error from r600_ib_test
@ 2012-02-02 20:23 Matthijs Kooijman
  2012-02-02 21:01 ` Alex Deucher
  0 siblings, 1 reply; 2+ messages in thread
From: Matthijs Kooijman @ 2012-02-02 20:23 UTC (permalink / raw
  To: dri-devel

This return statement got dropped while fixing the conflicts introduced
in 7a7e8734ac3.
---
 drivers/gpu/drm/radeon/evergreen.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Note that I've not actually tested this change, I just noticed when
reviewing the mentioned merge commit. If the removal of the return
statement was intentional, this patch makes no sense (but sending a
patch was the easiest way to point out this bug).

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index ccde2c9..5056a53 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3190,6 +3190,7 @@ static int evergreen_startup(struct radeon_device *rdev)
 	if (r) {
 		DRM_ERROR("radeon: failed testing IB (%d).\n", r);
 		rdev->accel_working = false;
+		return r;
 	}
 
 	r = r600_audio_init(rdev);
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm/radeon: do not continue after error from r600_ib_test
  2012-02-02 20:23 [PATCH] drm/radeon: do not continue after error from r600_ib_test Matthijs Kooijman
@ 2012-02-02 21:01 ` Alex Deucher
  0 siblings, 0 replies; 2+ messages in thread
From: Alex Deucher @ 2012-02-02 21:01 UTC (permalink / raw
  To: Matthijs Kooijman; +Cc: dri-devel

On Thu, Feb 2, 2012 at 3:23 PM, Matthijs Kooijman <matthijs@stdin.nl> wrote:
> This return statement got dropped while fixing the conflicts introduced
> in 7a7e8734ac3.
> ---
>  drivers/gpu/drm/radeon/evergreen.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> Note that I've not actually tested this change, I just noticed when
> reviewing the mentioned merge commit. If the removal of the return
> statement was intentional, this patch makes no sense (but sending a
> patch was the easiest way to point out this bug).

Patch is correct.

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

>
> diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
> index ccde2c9..5056a53 100644
> --- a/drivers/gpu/drm/radeon/evergreen.c
> +++ b/drivers/gpu/drm/radeon/evergreen.c
> @@ -3190,6 +3190,7 @@ static int evergreen_startup(struct radeon_device *rdev)
>        if (r) {
>                DRM_ERROR("radeon: failed testing IB (%d).\n", r);
>                rdev->accel_working = false;
> +               return r;
>        }
>
>        r = r600_audio_init(rdev);
> --
> 1.7.7.3
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-02-02 21:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-02 20:23 [PATCH] drm/radeon: do not continue after error from r600_ib_test Matthijs Kooijman
2012-02-02 21:01 ` Alex Deucher

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 read-only IMAP folder(s) and NNTP newsgroup(s).