drm/radeon: remove r300_gpu_is_lockup

Since it is now identical to r100_gpu_is_lockup.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 04ec269..6419a59 100644 (file)
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -377,20 +377,6 @@ void r300_gpu_init(struct radeon_device *rdev)
                 rdev->num_gb_pipes, rdev->num_z_pipes);
 }
 
-bool r300_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)
-{
-       u32 rbbm_status;
-
-       rbbm_status = RREG32(R_000E40_RBBM_STATUS);
-       if (!G_000E40_GUI_ACTIVE(rbbm_status)) {
-               radeon_ring_lockup_update(ring);
-               return false;
-       }
-       /* force CP activities */
-       radeon_ring_force_activity(rdev, ring);
-       return radeon_ring_test_lockup(rdev, ring);
-}
-
 int r300_asic_reset(struct radeon_device *rdev)
 {
        struct r100_mc_save save;

diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 958b9ea..5e5694e 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -299,7 +299,7 @@ static struct radeon_asic r300_asic = {
                        .ring_start = &r300_ring_start,
                        .ring_test = &r100_ring_test,
                        .ib_test = &r100_ib_test,
-                       .is_lockup = &r300_gpu_is_lockup,
+                       .is_lockup = &r100_gpu_is_lockup,
                }
        },
        .irq = {
@@ -373,7 +373,7 @@ static struct radeon_asic r300_asic_pcie = {
                        .ring_start = &r300_ring_start,
                        .ring_test = &r100_ring_test,
                        .ib_test = &r100_ib_test,
-                       .is_lockup = &r300_gpu_is_lockup,
+                       .is_lockup = &r100_gpu_is_lockup,
                }
        },
        .irq = {
@@ -447,7 +447,7 @@ static struct radeon_asic r420_asic = {
                        .ring_start = &r300_ring_start,
                        .ring_test = &r100_ring_test,
                        .ib_test = &r100_ib_test,
-                       .is_lockup = &r300_gpu_is_lockup,
+                       .is_lockup = &r100_gpu_is_lockup,
                }
        },
        .irq = {
@@ -521,7 +521,7 @@ static struct radeon_asic rs400_asic = {
                        .ring_start = &r300_ring_start,
                        .ring_test = &r100_ring_test,
                        .ib_test = &r100_ib_test,
-                       .is_lockup = &r300_gpu_is_lockup,
+                       .is_lockup = &r100_gpu_is_lockup,
                }
        },
        .irq = {
@@ -595,7 +595,7 @@ static struct radeon_asic rs600_asic = {
                        .ring_start = &r300_ring_start,
                        .ring_test = &r100_ring_test,
                        .ib_test = &r100_ib_test,
-                       .is_lockup = &r300_gpu_is_lockup,
+                       .is_lockup = &r100_gpu_is_lockup,
                }
        },
        .irq = {
@@ -669,7 +669,7 @@ static struct radeon_asic rs690_asic = {
                        .ring_start = &r300_ring_start,
                        .ring_test = &r100_ring_test,
                        .ib_test = &r100_ib_test,
-                       .is_lockup = &r300_gpu_is_lockup,
+                       .is_lockup = &r100_gpu_is_lockup,
                }
        },
        .irq = {
@@ -743,7 +743,7 @@ static struct radeon_asic rv515_asic = {
                        .ring_start = &rv515_ring_start,
                        .ring_test = &r100_ring_test,
                        .ib_test = &r100_ib_test,
-                       .is_lockup = &r300_gpu_is_lockup,
+                       .is_lockup = &r100_gpu_is_lockup,
                }
        },
        .irq = {
@@ -817,7 +817,7 @@ static struct radeon_asic r520_asic = {
                        .ring_start = &rv515_ring_start,
                        .ring_test = &r100_ring_test,
                        .ib_test = &r100_ib_test,
-                       .is_lockup = &r300_gpu_is_lockup,
+                       .is_lockup = &r100_gpu_is_lockup,
                }
        },
        .irq = {

diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index b0941f9..1e128e0 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -154,7 +154,6 @@ extern int r300_init(struct radeon_device *rdev);
 extern void r300_fini(struct radeon_device *rdev);
 extern int r300_suspend(struct radeon_device *rdev);
 extern int r300_resume(struct radeon_device *rdev);
-extern bool r300_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *cp);
 extern int r300_asic_reset(struct radeon_device *rdev);
 extern void r300_ring_start(struct radeon_device *rdev, struct radeon_ring *ring);
 extern void r300_fence_ring_emit(struct radeon_device *rdev,