diff options
| author | Christian König <deathsimple@vodafone.de> | 2011-10-20 06:47:13 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 14:50:48 -0500 |
| commit | d6d2730c71a5d41a121a7b567bf7ff9c5d4cd3ab (patch) | |
| tree | c67fa8e38c4eb3ac83b5e3f90814317893a99590 /drivers/gpu | |
| parent | 47492a23a128e953bd5087b1cac909cd8124ca5e (diff) | |
drm/radeon: disable compute rings on cayman for now
Disable the additional compute rings on cayman
until their setup is fully implemented.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 2d809e62c4c6..7c953579a405 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
| @@ -1234,8 +1234,8 @@ int cayman_cp_resume(struct radeon_device *rdev) | |||
| 1234 | /* start the rings */ | 1234 | /* start the rings */ |
| 1235 | cayman_cp_start(rdev); | 1235 | cayman_cp_start(rdev); |
| 1236 | rdev->cp[RADEON_RING_TYPE_GFX_INDEX].ready = true; | 1236 | rdev->cp[RADEON_RING_TYPE_GFX_INDEX].ready = true; |
| 1237 | rdev->cp[CAYMAN_RING_TYPE_CP1_INDEX].ready = true; | 1237 | rdev->cp[CAYMAN_RING_TYPE_CP1_INDEX].ready = false; |
| 1238 | rdev->cp[CAYMAN_RING_TYPE_CP2_INDEX].ready = true; | 1238 | rdev->cp[CAYMAN_RING_TYPE_CP2_INDEX].ready = false; |
| 1239 | /* this only test cp0 */ | 1239 | /* this only test cp0 */ |
| 1240 | r = radeon_ring_test(rdev, &rdev->cp[RADEON_RING_TYPE_GFX_INDEX]); | 1240 | r = radeon_ring_test(rdev, &rdev->cp[RADEON_RING_TYPE_GFX_INDEX]); |
| 1241 | if (r) { | 1241 | if (r) { |