drm/radeon/kms: check/restore sanity before doing anything else with GPU.

On systems using kexec, the new kernel is booted straight from the old kernel, without any warning to the graphics driver. So the GPU is basically left as-is in a running state, however the CPU side is completly reset.

Without stating the saneness of anyone using kexec on live systems, we should at least try not to crash the GPU. This patch resets 3 registers to 0 that could cause bad things to happen to the running system.

This allows kexec to work on a Power6/RN50 system.

Signed-off-by: Dave Airlie <airlied@redhat.com>

9 files changed, 42 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 5aa299527317..5d14732dc284 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3809,6 +3809,31 @@ void r100_fini(struct radeon_device *rdev)
         rdev->bios = NULL;
 }
 
+/*
+ * Due to how kexec works, it can leave the hw fully initialised when it
+ * boots the new kernel. However doing our init sequence with the CP and
+ * WB stuff setup causes GPU hangs on the RN50 at least. So at startup
+ * do some quick sanity checks and restore sane values to avoid this
+ * problem.
+ */
+void r100_restore_sanity(struct radeon_device *rdev)
+{
+        u32 tmp;
+
+        tmp = RREG32(RADEON_CP_CSQ_CNTL);
+        if (tmp) {
+                WREG32(RADEON_CP_CSQ_CNTL, 0);
+        }
+        tmp = RREG32(RADEON_CP_RB_CNTL);
+        if (tmp) {
+                WREG32(RADEON_CP_RB_CNTL, 0);
+        }
+        tmp = RREG32(RADEON_SCRATCH_UMSK);
+        if (tmp) {
+                WREG32(RADEON_SCRATCH_UMSK, 0);
+        }
+}
+
 int r100_init(struct radeon_device *rdev)
 {
         int r;
@@ -3821,6 +3846,8 @@ int r100_init(struct radeon_device *rdev)
         radeon_scratch_init(rdev);
         /* Initialize surface registers */
         radeon_surface_init(rdev);
+        /* sanity check some register to avoid hangs like after kexec */
+        r100_restore_sanity(rdev);
         /* TODO: disable VGA need to use VGA request */
         /* BIOS*/
         if (!radeon_get_bios(rdev)) {
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 7e81db5eb804..3c34da0c899a 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -1377,6 +1377,8 @@ int r300_init(struct radeon_device *rdev)
         /* Initialize surface registers */
         radeon_surface_init(rdev);
         /* TODO: disable VGA need to use VGA request */
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
         /* BIOS*/
         if (!radeon_get_bios(rdev)) {
                 if (ASIC_IS_AVIVO(rdev))
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index e6c89142bb4d..59f7bccc5be0 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -343,6 +343,8 @@ int r420_init(struct radeon_device *rdev)
         /* Initialize surface registers */
         radeon_surface_init(rdev);
         /* TODO: disable VGA need to use VGA request */
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
         /* BIOS*/
         if (!radeon_get_bios(rdev)) {
                 if (ASIC_IS_AVIVO(rdev))
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index 34330df28483..213e2e0027a3 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c
@@ -230,6 +230,8 @@ int r520_init(struct radeon_device *rdev)
         radeon_scratch_init(rdev);
         /* Initialize surface registers */
         radeon_surface_init(rdev);
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
         /* TODO: disable VGA need to use VGA request */
         /* BIOS*/
         if (!radeon_get_bios(rdev)) {
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index c0bbaa64157a..a5aff755f0d2 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -113,6 +113,7 @@ void r100_wb_fini(struct radeon_device *rdev);
 int r100_wb_init(struct radeon_device *rdev);
 int r100_cp_reset(struct radeon_device *rdev);
 void r100_vga_render_disable(struct radeon_device *rdev);
+void r100_restore_sanity(struct radeon_device *rdev);
 int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p,
                                          struct radeon_cs_packet *pkt,
                                          struct radeon_bo *robj);
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index 9e4240b3bf0b..c178481101e9 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -480,6 +480,8 @@ int rs400_init(struct radeon_device *rdev)
         /* Initialize surface registers */
         radeon_surface_init(rdev);
         /* TODO: disable VGA need to use VGA request */
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
         /* BIOS*/
         if (!radeon_get_bios(rdev)) {
                 if (ASIC_IS_AVIVO(rdev))
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 27d2e706c650..c5760921d166 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -879,6 +879,8 @@ int rs600_init(struct radeon_device *rdev)
         radeon_scratch_init(rdev);
         /* Initialize surface registers */
         radeon_surface_init(rdev);
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
         /* BIOS */
         if (!radeon_get_bios(rdev)) {
                 if (ASIC_IS_AVIVO(rdev))
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 23676b659e65..3dde54d57d09 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -707,6 +707,8 @@ int rs690_init(struct radeon_device *rdev)
         radeon_scratch_init(rdev);
         /* Initialize surface registers */
         radeon_surface_init(rdev);
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
         /* TODO: disable VGA need to use VGA request */
         /* BIOS*/
         if (!radeon_get_bios(rdev)) {
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 7d9a7b0a180a..3f04f735deae 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -468,6 +468,8 @@ int rv515_init(struct radeon_device *rdev)
         /* Initialize surface registers */
         radeon_surface_init(rdev);
         /* TODO: disable VGA need to use VGA request */
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
         /* BIOS*/
         if (!radeon_get_bios(rdev)) {
                 if (ASIC_IS_AVIVO(rdev))