diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2012-02-23 17:53:45 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-02-29 05:14:47 -0500 |
commit | f712812e1ba7f17a270f285c3e7e70c65186a8b4 (patch) | |
tree | 00b31997e1b369cca4dc7709b31a273fd9be3b3b /drivers/gpu/drm/radeon/evergreen.c | |
parent | dfb276f098e0e90319a346bae2f205f2690d6b42 (diff) |
drm/radeon/kms: make ring_start, ring_test, and ib_test per ring
Each ring type may need a different variant.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König<christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
-rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 4350a3fe4ec5..450b01d915e2 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -1539,7 +1539,7 @@ int evergreen_cp_resume(struct radeon_device *rdev) | |||
1539 | 1539 | ||
1540 | evergreen_cp_start(rdev); | 1540 | evergreen_cp_start(rdev); |
1541 | ring->ready = true; | 1541 | ring->ready = true; |
1542 | r = radeon_ring_test(rdev, ring); | 1542 | r = radeon_ring_test(rdev, RADEON_RING_TYPE_GFX_INDEX, ring); |
1543 | if (r) { | 1543 | if (r) { |
1544 | ring->ready = false; | 1544 | ring->ready = false; |
1545 | return r; | 1545 | return r; |
@@ -3237,7 +3237,7 @@ static int evergreen_startup(struct radeon_device *rdev) | |||
3237 | if (r) | 3237 | if (r) |
3238 | return r; | 3238 | return r; |
3239 | 3239 | ||
3240 | r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX); | 3240 | r = radeon_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]); |
3241 | if (r) { | 3241 | if (r) { |
3242 | DRM_ERROR("radeon: failed testing IB (%d).\n", r); | 3242 | DRM_ERROR("radeon: failed testing IB (%d).\n", r); |
3243 | rdev->accel_working = false; | 3243 | rdev->accel_working = false; |