aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/evergreen.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2011-08-25 13:39:48 -0400
committerDave Airlie <airlied@redhat.com>2011-12-20 14:49:28 -0500
commit7465280c076d6440e5908c158c83b542dc063a30 (patch)
tree7781cffcc3784293e5bb97f20fb4a6c8109684ec /drivers/gpu/drm/radeon/evergreen.c
parent851a6bd99edda0094def3b0b81bb1c7c0e886e65 (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/evergreen.c')
-rw-r--r--drivers/gpu/drm/radeon/evergreen.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 5e00d1670aa..1c7af565433 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3018,11 +3018,11 @@ restart_ih:
3018 case 177: /* CP_INT in IB1 */ 3018 case 177: /* CP_INT in IB1 */
3019 case 178: /* CP_INT in IB2 */ 3019 case 178: /* CP_INT in IB2 */
3020 DRM_DEBUG("IH: CP int: 0x%08x\n", src_data); 3020 DRM_DEBUG("IH: CP int: 0x%08x\n", src_data);
3021 radeon_fence_process(rdev); 3021 radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);
3022 break; 3022 break;
3023 case 181: /* CP EOP event */ 3023 case 181: /* CP EOP event */
3024 DRM_DEBUG("IH: CP EOP\n"); 3024 DRM_DEBUG("IH: CP EOP\n");
3025 radeon_fence_process(rdev); 3025 radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);
3026 break; 3026 break;
3027 case 233: /* GUI IDLE */ 3027 case 233: /* GUI IDLE */
3028 DRM_DEBUG("IH: GUI idle\n"); 3028 DRM_DEBUG("IH: GUI idle\n");
@@ -3221,7 +3221,7 @@ int evergreen_init(struct radeon_device *rdev)
3221 /* Initialize clocks */ 3221 /* Initialize clocks */
3222 radeon_get_clock_info(rdev->ddev); 3222 radeon_get_clock_info(rdev->ddev);
3223 /* Fence driver */ 3223 /* Fence driver */
3224 r = radeon_fence_driver_init(rdev); 3224 r = radeon_fence_driver_init(rdev, 1);
3225 if (r) 3225 if (r)
3226 return r; 3226 return r;
3227 /* initialize AGP */ 3227 /* initialize AGP */