[PATCH] drm/radeon/kms: fix bug in r600_gpu_is_lockup

[PATCH] drm/radeon/kms: fix bug in r600_gpu_is_lockup

[Alex Deucher]

We were using the lockup struct from the wrong union.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: Jerome Glisse <jglisse@redhat.com>
---
 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 2078108..292b282 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -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

[PATCH] drm/radeon/kms: implement gpu lockup check for evergreen

[Alex Deucher]

Now that soft reset works, we can add this.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
 drivers/gpu/drm/radeon/evergreen.c |   26 ++++++++++++++++++++++++--
 drivers/gpu/drm/radeon/radeon.h    |    1 +
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 3c580b3..01d292c 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -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)
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 77169e8..e6b509a 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -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 {
-- 
1.7.1.1

Re: [PATCH] drm/radeon/kms: fix bug in r600_gpu_is_lockup

[Jerome Glisse]

On Tue, Dec 21, 2010 at 4:05 PM, Alex Deucher <alexdeucher@gmail.com> wrote:
> We were using the lockup struct from the wrong union.
>
> Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
> Cc: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>

> ---
>  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 2078108..292b282 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -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
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>