diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2011-08-25 13:39:48 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 14:49:28 -0500 |
commit | 7465280c076d6440e5908c158c83b542dc063a30 (patch) | |
tree | 7781cffcc3784293e5bb97f20fb4a6c8109684ec /drivers/gpu/drm/radeon/rs600.c | |
parent | 851a6bd99edda0094def3b0b81bb1c7c0e886e65 (diff) |
drm/radeon/kms: add support for multiple fence queues v2
For supporting multiple CP ring buffers, async DMA
engines and UVD. We still need a way to synchronize
between engines.
v2 initialize unused fence driver ring to avoid issue in
suspend/unload
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
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/rs600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index b1053d640423..1c9ab9409531 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
@@ -642,7 +642,7 @@ int rs600_irq_process(struct radeon_device *rdev) | |||
642 | while (status || rdev->irq.stat_regs.r500.disp_int) { | 642 | while (status || rdev->irq.stat_regs.r500.disp_int) { |
643 | /* SW interrupt */ | 643 | /* SW interrupt */ |
644 | if (G_000044_SW_INT(status)) { | 644 | if (G_000044_SW_INT(status)) { |
645 | radeon_fence_process(rdev); | 645 | radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX); |
646 | } | 646 | } |
647 | /* GUI idle */ | 647 | /* GUI idle */ |
648 | if (G_000040_GUI_IDLE(status)) { | 648 | if (G_000040_GUI_IDLE(status)) { |
@@ -962,7 +962,7 @@ int rs600_init(struct radeon_device *rdev) | |||
962 | rs600_mc_init(rdev); | 962 | rs600_mc_init(rdev); |
963 | rs600_debugfs(rdev); | 963 | rs600_debugfs(rdev); |
964 | /* Fence driver */ | 964 | /* Fence driver */ |
965 | r = radeon_fence_driver_init(rdev); | 965 | r = radeon_fence_driver_init(rdev, 1); |
966 | if (r) | 966 | if (r) |
967 | return r; | 967 | return r; |
968 | r = radeon_irq_kms_init(rdev); | 968 | r = radeon_irq_kms_init(rdev); |