diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2013-01-18 13:05:39 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2013-01-31 16:24:49 -0500 |
commit | 410a3418a88cc1273a281d347687f736fc39dd86 (patch) | |
tree | 9057195495a9f1ae1fa128c27b0fdfb09077d224 /drivers/gpu/drm/radeon/ni.c | |
parent | 9ff0744c6d7745c331a484a937160f4c2c056923 (diff) |
drm/radeon: add a bios scratch asic hung helper
Used by all asic families from r600+.
Flag for the vbios and later instances of the driver
that the GPU is hung.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 835992d8d067..af9e86d2fc07 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -1422,6 +1422,8 @@ static int cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) | |||
1422 | if (reset_mask == 0) | 1422 | if (reset_mask == 0) |
1423 | return 0; | 1423 | return 0; |
1424 | 1424 | ||
1425 | r600_set_bios_scratch_engine_hung(rdev, true); | ||
1426 | |||
1425 | dev_info(rdev->dev, "GPU softreset: 0x%08X\n", reset_mask); | 1427 | dev_info(rdev->dev, "GPU softreset: 0x%08X\n", reset_mask); |
1426 | 1428 | ||
1427 | dev_info(rdev->dev, " VM_CONTEXT0_PROTECTION_FAULT_ADDR 0x%08X\n", | 1429 | dev_info(rdev->dev, " VM_CONTEXT0_PROTECTION_FAULT_ADDR 0x%08X\n", |
@@ -1448,6 +1450,9 @@ static int cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) | |||
1448 | udelay(50); | 1450 | udelay(50); |
1449 | 1451 | ||
1450 | evergreen_mc_resume(rdev, &save); | 1452 | evergreen_mc_resume(rdev, &save); |
1453 | |||
1454 | r600_set_bios_scratch_engine_hung(rdev, false); | ||
1455 | |||
1451 | return 0; | 1456 | return 0; |
1452 | } | 1457 | } |
1453 | 1458 | ||