aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rv515.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2011-11-20 15:45:34 -0500
committerDave Airlie <airlied@redhat.com>2011-12-20 14:51:19 -0500
commit30eb77f4e6ba20f797af4ff79807fae7cb67429e (patch)
tree0143bb70c00f3080d70cf8e2a966cf8d7f137dfc /drivers/gpu/drm/radeon/rv515.c
parentaf9720f4907e0a4a4341a015efe08026b3d3eb2e (diff)
drm/radeon: precompute fence cpu/gpu addr once v3
Add a start fence driver helper function which will be call once for each ring and will compute cpu/gpu addr for fence depending on wether to use wb buffer or scratch reg. This patch replace initialize fence driver separately which was broken in regard of GPU lockup. The fence list for created, emited, signaled must be initialize once and only from the asic init callback not from the startup call back which is call from the gpu reset. v2: With this in place we no longer need to know the number of rings in fence_driver_init, also writing to the scratch reg before knowing its offset is a bad idea. v3: rebase on top of change to previous patch in the serie Signed-off-by: Christian König <deathsimple@vodafone.de> Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rv515.c')
-rw-r--r--drivers/gpu/drm/radeon/rv515.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index beed57c7df96..21d90d9fe11c 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -393,6 +393,12 @@ static int rv515_startup(struct radeon_device *rdev)
393 if (r) 393 if (r)
394 return r; 394 return r;
395 395
396 r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);
397 if (r) {
398 dev_err(rdev->dev, "failed initializing CP fences (%d).\n", r);
399 return r;
400 }
401
396 /* Enable IRQ */ 402 /* Enable IRQ */
397 rs600_irq_set(rdev); 403 rs600_irq_set(rdev);
398 rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); 404 rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
@@ -511,7 +517,7 @@ int rv515_init(struct radeon_device *rdev)
511 rv515_mc_init(rdev); 517 rv515_mc_init(rdev);
512 rv515_debugfs(rdev); 518 rv515_debugfs(rdev);
513 /* Fence driver */ 519 /* Fence driver */
514 r = radeon_fence_driver_init(rdev, 1); 520 r = radeon_fence_driver_init(rdev);
515 if (r) 521 if (r)
516 return r; 522 return r;
517 r = radeon_irq_kms_init(rdev); 523 r = radeon_irq_kms_init(rdev);