drm/radeon: apply Murphy's law to the kms irq code v3

1. It is really dangerous to have more than one
   spinlock protecting the same information.

2. radeon_irq_set sometimes wasn't called with lock
   protection, so it can happen that more than one
   CPU would tamper with the irq regs at the same
   time.

3. The pm.gui_idle variable was assuming that the 3D
   engine wasn't becoming idle between testing the
   register and setting the variable. So just remove
   it and test the register directly.

v2: Also handle the hpd irq code the same way.
v3: Rename hpd parameter for clarification.

Signed-off-by: Christian Koenig <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 10 insertions, 28 deletions

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index b487c69a486d..9cd77286542c 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -709,6 +709,7 @@ void r600_hpd_init(struct radeon_device *rdev)
 {
         struct drm_device *dev = rdev->ddev;
         struct drm_connector *connector;
+        unsigned enable = 0;
 
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                 struct radeon_connector *radeon_connector = to_radeon_connector(connector);
@@ -729,28 +730,22 @@ void r600_hpd_init(struct radeon_device *rdev)
                         switch (radeon_connector->hpd.hpd) {
                         case RADEON_HPD_1:
                                 WREG32(DC_HPD1_CONTROL, tmp);
-                                rdev->irq.hpd[0] = true;
                                 break;
                         case RADEON_HPD_2:
                                 WREG32(DC_HPD2_CONTROL, tmp);
-                                rdev->irq.hpd[1] = true;
                                 break;
                         case RADEON_HPD_3:
                                 WREG32(DC_HPD3_CONTROL, tmp);
-                                rdev->irq.hpd[2] = true;
                                 break;
                         case RADEON_HPD_4:
                                 WREG32(DC_HPD4_CONTROL, tmp);
-                                rdev->irq.hpd[3] = true;
                                 break;
                                 /* DCE 3.2 */
                         case RADEON_HPD_5:
                                 WREG32(DC_HPD5_CONTROL, tmp);
-                                rdev->irq.hpd[4] = true;
                                 break;
                         case RADEON_HPD_6:
                                 WREG32(DC_HPD6_CONTROL, tmp);
-                                rdev->irq.hpd[5] = true;
                                 break;
                         default:
                                 break;
@@ -759,85 +754,73 @@ void r600_hpd_init(struct radeon_device *rdev)
                         switch (radeon_connector->hpd.hpd) {
                         case RADEON_HPD_1:
                                 WREG32(DC_HOT_PLUG_DETECT1_CONTROL, DC_HOT_PLUG_DETECTx_EN);
-                                rdev->irq.hpd[0] = true;
                                 break;
                         case RADEON_HPD_2:
                                 WREG32(DC_HOT_PLUG_DETECT2_CONTROL, DC_HOT_PLUG_DETECTx_EN);
-                                rdev->irq.hpd[1] = true;
                                 break;
                         case RADEON_HPD_3:
                                 WREG32(DC_HOT_PLUG_DETECT3_CONTROL, DC_HOT_PLUG_DETECTx_EN);
-                                rdev->irq.hpd[2] = true;
                                 break;
                         default:
                                 break;
                         }
                 }
+                enable |= 1 << radeon_connector->hpd.hpd;
                 radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
         }
-        if (rdev->irq.installed)
-                r600_irq_set(rdev);
+        radeon_irq_kms_enable_hpd(rdev, enable);
 }
 
 void r600_hpd_fini(struct radeon_device *rdev)
 {
         struct drm_device *dev = rdev->ddev;
         struct drm_connector *connector;
+        unsigned disable = 0;
 
-        if (ASIC_IS_DCE3(rdev)) {
-                list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+                struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+                if (ASIC_IS_DCE3(rdev)) {
                         switch (radeon_connector->hpd.hpd) {
                         case RADEON_HPD_1:
                                 WREG32(DC_HPD1_CONTROL, 0);
-                                rdev->irq.hpd[0] = false;
                                 break;
                         case RADEON_HPD_2:
                                 WREG32(DC_HPD2_CONTROL, 0);
-                                rdev->irq.hpd[1] = false;
                                 break;
                         case RADEON_HPD_3:
                                 WREG32(DC_HPD3_CONTROL, 0);
-                                rdev->irq.hpd[2] = false;
                                 break;
                         case RADEON_HPD_4:
                                 WREG32(DC_HPD4_CONTROL, 0);
-                                rdev->irq.hpd[3] = false;
                                 break;
                                 /* DCE 3.2 */
                         case RADEON_HPD_5:
                                 WREG32(DC_HPD5_CONTROL, 0);
-                                rdev->irq.hpd[4] = false;
                                 break;
                         case RADEON_HPD_6:
                                 WREG32(DC_HPD6_CONTROL, 0);
-                                rdev->irq.hpd[5] = false;
                                 break;
                         default:
                                 break;
                         }
-                }
-        } else {
-                list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+                } else {
                         switch (radeon_connector->hpd.hpd) {
                         case RADEON_HPD_1:
                                 WREG32(DC_HOT_PLUG_DETECT1_CONTROL, 0);
-                                rdev->irq.hpd[0] = false;
                                 break;
                         case RADEON_HPD_2:
                                 WREG32(DC_HOT_PLUG_DETECT2_CONTROL, 0);
-                                rdev->irq.hpd[1] = false;
                                 break;
                         case RADEON_HPD_3:
                                 WREG32(DC_HOT_PLUG_DETECT3_CONTROL, 0);
-                                rdev->irq.hpd[2] = false;
                                 break;
                         default:
                                 break;
                         }
                 }
+                disable |= 1 << radeon_connector->hpd.hpd;
         }
+        radeon_irq_kms_disable_hpd(rdev, disable);
 }
 
 /*
@@ -3476,7 +3459,6 @@ restart_ih:
                         break;
                 case 233: /* GUI IDLE */
                         DRM_DEBUG("IH: GUI idle\n");
-                        rdev->pm.gui_idle = true;
                         wake_up(&rdev->irq.idle_queue);
                         break;
                 default: