drm/radeon: remove gui_idle interrupt infrastructure

It was only used for dynpm, but has been replaced with
a better implementation using fences.  Remove it.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

8 files changed, 0 insertions, 91 deletions

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index bea39e7d9a51..90366e309495 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -2528,10 +2528,6 @@ int evergreen_irq_set(struct radeon_device *rdev)
                 DRM_DEBUG("evergreen_irq_set: hdmi 5\n");
                 afmt6 |= AFMT_AZ_FORMAT_WTRIG_MASK;
         }
-        if (rdev->irq.gui_idle) {
-                DRM_DEBUG("gui idle\n");
-                grbm_int_cntl |= GUI_IDLE_INT_ENABLE;
-        }
 
         if (rdev->family >= CHIP_CAYMAN) {
                 cayman_cp_int_cntl_setup(rdev, 0, cp_int_cntl);
@@ -3066,7 +3062,6 @@ restart_ih:
                         break;
                 case 233: /* GUI IDLE */
                         DRM_DEBUG("IH: GUI idle\n");
-                        wake_up(&rdev->irq.idle_queue);
                         break;
                 default:
                         DRM_DEBUG("Unhandled interrupt: %d %d\n", src_id, src_data);
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 163c33e1a1d6..ff3a444836d4 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -700,9 +700,6 @@ int r100_irq_set(struct radeon_device *rdev)
         if (atomic_read(&rdev->irq.ring_int[RADEON_RING_TYPE_GFX_INDEX])) {
                 tmp |= RADEON_SW_INT_ENABLE;
         }
-        if (rdev->irq.gui_idle) {
-                tmp |= RADEON_GUI_IDLE_MASK;
-        }
         if (rdev->irq.crtc_vblank_int[0] ||
             atomic_read(&rdev->irq.pflip[0])) {
                 tmp |= RADEON_CRTC_VBLANK_MASK;
@@ -739,12 +736,6 @@ static uint32_t r100_irq_ack(struct radeon_device *rdev)
                 RADEON_CRTC_VBLANK_STAT | RADEON_CRTC2_VBLANK_STAT |
                 RADEON_FP_DETECT_STAT | RADEON_FP2_DETECT_STAT;
 
-        /* the interrupt works, but the status bit is permanently asserted */
-        if (rdev->irq.gui_idle && radeon_gui_idle(rdev)) {
-                if (!rdev->irq.gui_idle_acked)
-                        irq_mask |= RADEON_GUI_IDLE_STAT;
-        }
-
         if (irqs) {
                 WREG32(RADEON_GEN_INT_STATUS, irqs);
         }
@@ -756,9 +747,6 @@ int r100_irq_process(struct radeon_device *rdev)
         uint32_t status, msi_rearm;
         bool queue_hotplug = false;
 
-        /* reset gui idle ack.  the status bit is broken */
-        rdev->irq.gui_idle_acked = false;
-
         status = r100_irq_ack(rdev);
         if (!status) {
                 return IRQ_NONE;
@@ -771,11 +759,6 @@ int r100_irq_process(struct radeon_device *rdev)
                 if (status & RADEON_SW_INT_TEST) {
                         radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);
                 }
-                /* gui idle interrupt */
-                if (status & RADEON_GUI_IDLE_STAT) {
-                        rdev->irq.gui_idle_acked = true;
-                        wake_up(&rdev->irq.idle_queue);
-                }
                 /* Vertical blank interrupts */
                 if (status & RADEON_CRTC_VBLANK_STAT) {
                         if (rdev->irq.crtc_vblank_int[0]) {
@@ -805,8 +788,6 @@ int r100_irq_process(struct radeon_device *rdev)
                 }
                 status = r100_irq_ack(rdev);
         }
-        /* reset gui idle ack.  the status bit is broken */
-        rdev->irq.gui_idle_acked = false;
         if (queue_hotplug)
                 schedule_work(&rdev->hotplug_work);
         if (rdev->msi_enabled) {
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index d79c639ae739..459c251991c1 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -3088,10 +3088,6 @@ int r600_irq_set(struct radeon_device *rdev)
                 DRM_DEBUG("r600_irq_set: hdmi 0\n");
                 hdmi1 |= HDMI0_AZ_FORMAT_WTRIG_MASK;
         }
-        if (rdev->irq.gui_idle) {
-                DRM_DEBUG("gui idle\n");
-                grbm_int_cntl |= GUI_IDLE_INT_ENABLE;
-        }
 
         WREG32(CP_INT_CNTL, cp_int_cntl);
         WREG32(DxMODE_INT_MASK, mode_int);
@@ -3475,7 +3471,6 @@ restart_ih:
                         break;
                 case 233: /* GUI IDLE */
                         DRM_DEBUG("IH: GUI idle\n");
-                        wake_up(&rdev->irq.idle_queue);
                         break;
                 default:
                         DRM_DEBUG("Unhandled interrupt: %d %d\n", src_id, src_data);
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 59a15315ae9f..5dbd591818fe 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -566,9 +566,6 @@ struct radeon_irq {
         atomic_t                        pflip[RADEON_MAX_CRTCS];
         wait_queue_head_t               vblank_queue;
         bool                            hpd[RADEON_MAX_HPD_PINS];
-        bool                            gui_idle;
-        bool                            gui_idle_acked;
-        wait_queue_head_t               idle_queue;
         bool                            afmt[RADEON_MAX_AFMT_BLOCKS];
         union radeon_irq_stat_regs      stat_regs;
 };
@@ -583,7 +580,6 @@ void radeon_irq_kms_enable_afmt(struct radeon_device *rdev, int block);
 void radeon_irq_kms_disable_afmt(struct radeon_device *rdev, int block);
 void radeon_irq_kms_enable_hpd(struct radeon_device *rdev, unsigned hpd_mask);
 void radeon_irq_kms_disable_hpd(struct radeon_device *rdev, unsigned hpd_mask);
-int radeon_irq_kms_wait_gui_idle(struct radeon_device *rdev);
 
 /*
  * CP & rings.
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 7a3daebd732d..c78f0346dfe4 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1013,7 +1013,6 @@ int radeon_device_init(struct radeon_device *rdev,
         init_rwsem(&rdev->pm.mclk_lock);
         init_rwsem(&rdev->exclusive_lock);
         init_waitqueue_head(&rdev->irq.vblank_queue);
-        init_waitqueue_head(&rdev->irq.idle_queue);
         r = radeon_gem_init(rdev);
         if (r)
                 return r;
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index afaa1727abd2..c4e638d6f8af 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -99,7 +99,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev)
         /* Disable *all* interrupts */
         for (i = 0; i < RADEON_NUM_RINGS; i++)
                 atomic_set(&rdev->irq.ring_int[i], 0);
-        rdev->irq.gui_idle = false;
         for (i = 0; i < RADEON_MAX_HPD_PINS; i++)
                 rdev->irq.hpd[i] = false;
         for (i = 0; i < RADEON_MAX_CRTCS; i++) {
@@ -147,7 +146,6 @@ void radeon_driver_irq_uninstall_kms(struct drm_device *dev)
         /* Disable *all* interrupts */
         for (i = 0; i < RADEON_NUM_RINGS; i++)
                 atomic_set(&rdev->irq.ring_int[i], 0);
-        rdev->irq.gui_idle = false;
         for (i = 0; i < RADEON_MAX_HPD_PINS; i++)
                 rdev->irq.hpd[i] = false;
         for (i = 0; i < RADEON_MAX_CRTCS; i++) {
@@ -457,34 +455,3 @@ void radeon_irq_kms_disable_hpd(struct radeon_device *rdev, unsigned hpd_mask)
         spin_unlock_irqrestore(&rdev->irq.lock, irqflags);
 }
 
-/**
- * radeon_irq_kms_wait_gui_idle - waits for drawing engine to be idle
- *
- * @rdev: radeon device pointer
- *
- * Enabled the GUI idle interrupt and waits for it to fire (r6xx+).
- * This is currently used to make sure the 3D engine is idle for power
- * management, but should be replaces with proper fence waits.
- * GUI idle interrupts don't work very well on pre-r6xx hw and it also
- * does not take into account other aspects of the chip that may be busy.
- * DO NOT USE GOING FORWARD.
- */
-int radeon_irq_kms_wait_gui_idle(struct radeon_device *rdev)
-{
-        unsigned long irqflags;
-        int r;
-
-        spin_lock_irqsave(&rdev->irq.lock, irqflags);
-        rdev->irq.gui_idle = true;
-        radeon_irq_set(rdev);
-        spin_unlock_irqrestore(&rdev->irq.lock, irqflags);
-
-        r = wait_event_timeout(rdev->irq.idle_queue, radeon_gui_idle(rdev),
-                               msecs_to_jiffies(RADEON_WAIT_IDLE_TIMEOUT));
-
-        spin_lock_irqsave(&rdev->irq.lock, irqflags);
-        rdev->irq.gui_idle = false;
-        radeon_irq_set(rdev);
-        spin_unlock_irqrestore(&rdev->irq.lock, irqflags);
-        return r;
-}
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 31b84b6672b7..8f7064492e4b 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -575,9 +575,6 @@ int rs600_irq_set(struct radeon_device *rdev)
         if (atomic_read(&rdev->irq.ring_int[RADEON_RING_TYPE_GFX_INDEX])) {
                 tmp |= S_000040_SW_INT_EN(1);
         }
-        if (rdev->irq.gui_idle) {
-                tmp |= S_000040_GUI_IDLE(1);
-        }
         if (rdev->irq.crtc_vblank_int[0] ||
             atomic_read(&rdev->irq.pflip[0])) {
                 mode_int |= S_006540_D1MODE_VBLANK_INT_MASK(1);
@@ -610,12 +607,6 @@ static inline u32 rs600_irq_ack(struct radeon_device *rdev)
         uint32_t irq_mask = S_000044_SW_INT(1);
         u32 tmp;
 
-        /* the interrupt works, but the status bit is permanently asserted */
-        if (rdev->irq.gui_idle && radeon_gui_idle(rdev)) {
-                if (!rdev->irq.gui_idle_acked)
-                        irq_mask |= S_000044_GUI_IDLE_STAT(1);
-        }
-
         if (G_000044_DISPLAY_INT_STAT(irqs)) {
                 rdev->irq.stat_regs.r500.disp_int = RREG32(R_007EDC_DISP_INTERRUPT_STATUS);
                 if (G_007EDC_LB_D1_VBLANK_INTERRUPT(rdev->irq.stat_regs.r500.disp_int)) {
@@ -675,9 +666,6 @@ int rs600_irq_process(struct radeon_device *rdev)
         bool queue_hotplug = false;
         bool queue_hdmi = false;
 
-        /* reset gui idle ack.  the status bit is broken */
-        rdev->irq.gui_idle_acked = false;
-
         status = rs600_irq_ack(rdev);
         if (!status &&
             !rdev->irq.stat_regs.r500.disp_int &&
@@ -691,11 +679,6 @@ int rs600_irq_process(struct radeon_device *rdev)
                 if (G_000044_SW_INT(status)) {
                         radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);
                 }
-                /* GUI idle */
-                if (G_000040_GUI_IDLE(status)) {
-                        rdev->irq.gui_idle_acked = true;
-                        wake_up(&rdev->irq.idle_queue);
-                }
                 /* Vertical blank interrupts */
                 if (G_007EDC_LB_D1_VBLANK_INTERRUPT(rdev->irq.stat_regs.r500.disp_int)) {
                         if (rdev->irq.crtc_vblank_int[0]) {
@@ -729,8 +712,6 @@ int rs600_irq_process(struct radeon_device *rdev)
                 }
                 status = rs600_irq_ack(rdev);
         }
-        /* reset gui idle ack.  the status bit is broken */
-        rdev->irq.gui_idle_acked = false;
         if (queue_hotplug)
                 schedule_work(&rdev->hotplug_work);
         if (queue_hdmi)
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 0139e227e3c7..3feff33e9d7f 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -3199,10 +3199,6 @@ int si_irq_set(struct radeon_device *rdev)
                 DRM_DEBUG("si_irq_set: hpd 6\n");
                 hpd6 |= DC_HPDx_INT_EN;
         }
-        if (rdev->irq.gui_idle) {
-                DRM_DEBUG("gui idle\n");
-                grbm_int_cntl |= GUI_IDLE_INT_ENABLE;
-        }
 
         WREG32(CP_INT_CNTL_RING0, cp_int_cntl);
         WREG32(CP_INT_CNTL_RING1, cp_int_cntl1);
@@ -3658,7 +3654,6 @@ restart_ih:
                         break;
                 case 233: /* GUI IDLE */
                         DRM_DEBUG("IH: GUI idle\n");
-                        wake_up(&rdev->irq.idle_queue);
                         break;
                 default:
                         DRM_DEBUG("Unhandled interrupt: %d %d\n", src_id, src_data);