aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/ni.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2011-11-17 14:25:56 -0500
committerDave Airlie <airlied@redhat.com>2011-12-20 14:51:46 -0500
commit78c5560a08114d7bbbce04cee1628049a22ea104 (patch)
treed0ad0e7e02e71ec66b9972f50d6c6dd3b3c65d40 /drivers/gpu/drm/radeon/ni.c
parentce9548843756d2fc64bf11c7208de52be5774863 (diff)
drm/radeon/kms: add some new ring params to better handle other ring types
Some rptr/wptrs fields have different offsets and not all rings are pm4 so add a new nop field. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Christian König <deathsimple@vodafone.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
-rw-r--r--drivers/gpu/drm/radeon/ni.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index a9b0e615804..d0d23c54764 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1412,7 +1412,8 @@ static int cayman_startup(struct radeon_device *rdev)
1412 evergreen_irq_set(rdev); 1412 evergreen_irq_set(rdev);
1413 1413
1414 r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET, 1414 r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
1415 CP_RB0_RPTR, CP_RB0_WPTR); 1415 CP_RB0_RPTR, CP_RB0_WPTR,
1416 0, 0xfffff, RADEON_CP_PACKET2);
1416 if (r) 1417 if (r)
1417 return r; 1418 return r;
1418 r = cayman_cp_load_microcode(rdev); 1419 r = cayman_cp_load_microcode(rdev);