aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rs400.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2010-03-09 09:45:11 -0500
committerDave Airlie <airlied@redhat.com>2010-04-05 21:21:04 -0400
commita2d07b7438f015a0349bc9af3c96a8164549bbc5 (patch)
tree7e05f0789ab09215efc96f8d2fd49eb61c3cab9f /drivers/gpu/drm/radeon/rs400.c
parent225758d8ba4fdcc1e8c9cf617fd89529bd4a9596 (diff)
drm/radeon/kms: rename gpu_reset to asic_reset
Patch rename gpu_reset to asic_reset in prevision of having gpu_reset doing more stuff than just basic asic reset. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rs400.c')
-rw-r--r--drivers/gpu/drm/radeon/rs400.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index 626aaf082b1..3deec218508 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -432,7 +432,7 @@ int rs400_resume(struct radeon_device *rdev)
432 /* setup MC before calling post tables */ 432 /* setup MC before calling post tables */
433 rs400_mc_program(rdev); 433 rs400_mc_program(rdev);
434 /* Reset gpu before posting otherwise ATOM will enter infinite loop */ 434 /* Reset gpu before posting otherwise ATOM will enter infinite loop */
435 if (radeon_gpu_reset(rdev)) { 435 if (radeon_asic_reset(rdev)) {
436 dev_warn(rdev->dev, "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", 436 dev_warn(rdev->dev, "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n",
437 RREG32(R_000E40_RBBM_STATUS), 437 RREG32(R_000E40_RBBM_STATUS),
438 RREG32(R_0007C0_CP_STAT)); 438 RREG32(R_0007C0_CP_STAT));
@@ -496,7 +496,7 @@ int rs400_init(struct radeon_device *rdev)
496 return r; 496 return r;
497 } 497 }
498 /* Reset gpu before posting otherwise ATOM will enter infinite loop */ 498 /* Reset gpu before posting otherwise ATOM will enter infinite loop */
499 if (radeon_gpu_reset(rdev)) { 499 if (radeon_asic_reset(rdev)) {
500 dev_warn(rdev->dev, 500 dev_warn(rdev->dev,
501 "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", 501 "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n",
502 RREG32(R_000E40_RBBM_STATUS), 502 RREG32(R_000E40_RBBM_STATUS),