diff options
| author | Christian König <deathsimple@vodafone.de> | 2011-10-13 13:19:22 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 19:50:10 +0000 |
| commit | bf85279958da96cb4b11aac89b34f0424c3c120e (patch) | |
| tree | 1d0197a268a642ee02ebe1a22d8f5ac0e7798494 /drivers/gpu/drm/radeon/radeon_device.c | |
| parent | 5596a9db156107b01ceb7db4d50cc091117da627 (diff) | |
| download | blackbird-op-linux-bf85279958da96cb4b11aac89b34f0424c3c120e.tar.gz blackbird-op-linux-bf85279958da96cb4b11aac89b34f0424c3c120e.zip | |
drm/radeon: make cp variable an array
Replace cp, cp1 and cp2 members with just an array
of radeon_cp structs.
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/drm/radeon/radeon_device.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 36296ad397a1..023c156eddd0 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -718,7 +718,8 @@ int radeon_device_init(struct radeon_device *rdev, * can recall function without having locking issues */ radeon_mutex_init(&rdev->cs_mutex); mutex_init(&rdev->ib_pool.mutex); - mutex_init(&rdev->cp.mutex); + for (i = 0; i < RADEON_NUM_RINGS; ++i) + mutex_init(&rdev->cp[i].mutex); mutex_init(&rdev->dc_hw_i2c_mutex); if (rdev->family >= CHIP_R600) spin_lock_init(&rdev->ih.lock); |
