drm/radeon/kms: fix bug in r600_gpu_is_lockup
Subsystems (2)
PATCH 1/1 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 <[email protected]>
Cc Jerome Glisse <[email protected]>
--- drivers/gpu/drm/radeon/r600.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/r600.c +8 -2
@@ -1345,13 +1345,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 */
@@ -1363,7 +1369,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)
Signature · 1 line
1.7.1.1
PATCH 1/1 drm/radeon/kms: implement gpu lockup check for evergreen
Now that soft reset works, we can add this.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/evergreen.c | 26 ++++++++++++++++++++++++-- drivers/gpu/drm/radeon/radeon.h | 1 + 2 files changed, 25 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +24 -2
@@ -2169,8 +2169,30 @@ int evergreen_mc_init(struct radeon_device *rdev)bool evergreen_gpu_is_lockup (struct radeon_device *rdev) { -/* FIXME: implement for evergreen */ -return false; +u32 srbm_status; +u32 grbm_status; +u32 grbm_status_se0, grbm_status_se1; +struct r100_gpu_lockup *lockup = &rdev->config.evergreen.lockup; +int r; + + srbm_status =RREG32 (SRBM_STATUS ); + grbm_status =RREG32 (GRBM_STATUS ); + grbm_status_se0 =RREG32 (GRBM_STATUS_SE0 ); + grbm_status_se1 =RREG32 (GRBM_STATUS_SE1 ); +if (!(grbm_status &GUI_ACTIVE )) { +r100_gpu_lockup_update (lockup, &rdev->cp); +return false; + } +/* force CP activities */ + r =radeon_ring_lock (rdev,2 ); +if (!r) { +/* PACKET2 NOP */ +radeon_ring_write (rdev,0x80000000 ); +radeon_ring_write (rdev,0x80000000 ); +radeon_ring_unlock_commit (rdev); + } + rdev->cp.rptr =RREG32 (CP_RB_RPTR ); +return r100_gpu_cp_is_lockup (rdev, lockup, &rdev->cp); }static int evergreen_gpu_soft_reset (struct radeon_device *rdev)
drivers/gpu/drm/radeon/radeon.h +1 -0
@@ -1037,6 +1037,7 @@ struct evergreen_asic {unsigned tiling_npipes;unsigned tiling_group_size;unsigned tile_config; +struct r100_gpu_lockup lockup; };union radeon_asic_config {
Signature · 1 line
1.7.1.1
Quoted 4 lines · Alex Deucher
We were using the lockup struct from the wrong union.
Signed-off-by Alex Deucher <[email protected]>Cc Jerome Glisse <[email protected]>
Reviewed-by Jerome Glisse <[email protected]>
Quoted 46 lines
---
drivers/gpu/drm/radeon/r600.c | 10 ++++++++--1 files changed, 8 insertions(+), 2 deletions(-)drivers/gpu/drm/radeon/r600.c +8
-3@@ -1345,13 +1345,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 */@@ -1363,7 +1369,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) --1.7.1.1
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel