diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-12-21 16:05:38 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-12-22 08:30:57 +1000 |
| commit | e29ff7290e826d5c7fda906d99233713a47a92c8 (patch) | |
| tree | 2ff28b6116f4af50ad17ca4ff326939266936ee8 /drivers/gpu/drm/radeon/r600.c | |
| parent | a93f344d3c04e4b84490c65f2a574387c593be40 (diff) | |
| download | kernel_samsung_smdk4412-e29ff7290e826d5c7fda906d99233713a47a92c8.zip kernel_samsung_smdk4412-e29ff7290e826d5c7fda906d99233713a47a92c8.tar.gz kernel_samsung_smdk4412-e29ff7290e826d5c7fda906d99233713a47a92c8.tar.bz2 | |
drm/radeon/kms: fix bug in r600_gpu_is_lockup
We were using the lockup struct from the wrong union.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 4d7a2e1..9c92db7 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1342,13 +1342,19 @@ bool r600_gpu_is_lockup(struct radeon_device *rdev) u32 srbm_status; u32 grbm_status; u32 grbm_status2; + struct r100_gpu_lockup *lockup; int r; + if (rdev->family >= CHIP_RV770) + lockup = &rdev->config.rv770.lockup; + else + lockup = &rdev->config.r600.lockup; + srbm_status = RREG32(R_000E50_SRBM_STATUS); grbm_status = RREG32(R_008010_GRBM_STATUS); grbm_status2 = RREG32(R_008014_GRBM_STATUS2); if (!G_008010_GUI_ACTIVE(grbm_status)) { - r100_gpu_lockup_update(&rdev->config.r300.lockup, &rdev->cp); + r100_gpu_lockup_update(lockup, &rdev->cp); return false; } /* force CP activities */ @@ -1360,7 +1366,7 @@ bool r600_gpu_is_lockup(struct radeon_device *rdev) radeon_ring_unlock_commit(rdev); } rdev->cp.rptr = RREG32(R600_CP_RB_RPTR); - return r100_gpu_cp_is_lockup(rdev, &rdev->config.r300.lockup, &rdev->cp); + return r100_gpu_cp_is_lockup(rdev, lockup, &rdev->cp); } int r600_asic_reset(struct radeon_device *rdev) |