diff mbox

drm/radeon: move the IB test after the AGP fallback

Message ID 1408884878-4496-1-git-send-email-deathsimple@vodafone.de (mailing list archive)
State New, archived
Headers show

Commit Message

Christian König Aug. 24, 2014, 12:54 p.m. UTC 
From: Christian König <christian.koenig@amd.com>

Otherwise we won't test if the fallback to PCIe GART really worked.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/radeon/radeon_device.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Michel Dänzer Aug. 25, 2014, 2:10 a.m. UTC | #1 
On 24.08.2014 21:54, Christian König wrote:
> From: Christian König <christian.koenig@amd.com>
> 
> Otherwise we won't test if the fallback to PCIe GART really worked.
> 
> Signed-off-by: Christian König <christian.koenig@amd.com>

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Alex Deucher Aug. 25, 2014, 3:41 p.m. UTC | #2 
On Sun, Aug 24, 2014 at 8:54 AM, Christian König
<deathsimple@vodafone.de> wrote:
> From: Christian König <christian.koenig@amd.com>
>
> Otherwise we won't test if the fallback to PCIe GART really worked.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>

Applied to my 3.18 tree.

Alex

> ---
>  drivers/gpu/drm/radeon/radeon_device.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> index c58f84f..152181d 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -1397,10 +1397,6 @@ int radeon_device_init(struct radeon_device *rdev,
>         if (r)
>                 return r;
>
> -       r = radeon_ib_ring_tests(rdev);
> -       if (r)
> -               DRM_ERROR("ib ring test failed (%d).\n", r);
> -
>         r = radeon_gem_debugfs_init(rdev);
>         if (r) {
>                 DRM_ERROR("registering gem debugfs failed (%d).\n", r);
> @@ -1418,6 +1414,10 @@ int radeon_device_init(struct radeon_device *rdev,
>                         return r;
>         }
>
> +       r = radeon_ib_ring_tests(rdev);
> +       if (r)
> +               DRM_ERROR("ib ring test failed (%d).\n", r);
> +
>         if ((radeon_testing & 1)) {
>                 if (rdev->accel_working)
>                         radeon_test_moves(rdev);
> --
> 1.8.3.2
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index c58f84f..152181d 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1397,10 +1397,6 @@  int radeon_device_init(struct radeon_device *rdev,
 	if (r)
 		return r;
 
-	r = radeon_ib_ring_tests(rdev);
-	if (r)
-		DRM_ERROR("ib ring test failed (%d).\n", r);
-
 	r = radeon_gem_debugfs_init(rdev);
 	if (r) {
 		DRM_ERROR("registering gem debugfs failed (%d).\n", r);
@@ -1418,6 +1414,10 @@  int radeon_device_init(struct radeon_device *rdev,
 			return r;
 	}
 
+	r = radeon_ib_ring_tests(rdev);
+	if (r)
+		DRM_ERROR("ib ring test failed (%d).\n", r);
+
 	if ((radeon_testing & 1)) {
 		if (rdev->accel_working)
 			radeon_test_moves(rdev);