Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-next

A few more fixes and cleanups for 4.6:
- DCE code cleanups
- HDP flush/invalidation fixes
- GPUVM fixes
- switch to drm_vblank_[on|off]
- PX fixes
- misc bug fixes

* 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux: (50 commits)
  drm/amdgpu: split pipeline sync out of SDMA vm_flush() as well
  drm/amdgpu: Revert "add mutex for ba_va->valids/invalids"
  drm/amdgpu: Revert "add lock for interval tree in vm"
  drm/amdgpu: Revert "add spin lock to protect freed list in vm (v3)"
  drm/amdgpu: reserve the PD during unmap and remove
  drm/amdgpu: Fix two bugs in amdgpu_vm_bo_split_mapping
  drm/radeon: Don't drop DP 2.7 Ghz link setup on some cards.
  MAINTAINERS: update radeon entry to include amdgpu as well
  drm/amdgpu: disable runtime pm on PX laptops without dGPU power control
  drm/radeon: disable runtime pm on PX laptops without dGPU power control
  drm/amd/amdgpu: Fix indentation in do_set_base() (DCEv8)
  drm/amd/amdgpu: make afmt_init cleanup if alloc fails (DCEv8)
  drm/amd/amdgpu: Move config init flag to bottom of sw_init (DCEv8)
  drm/amd/amdgpu: Don't proceed into audio_fini if audio is disabled (DCEv8)
  drm/amd/amdgpu: Fix identation in do_set_base() (DCEv10)
  drm/amd/amdgpu: Make afmt_init cleanup if alloc fails (DCEv10)
  drm/amd/amdgpu: Move initialized flag to bottom of sw_init (DCEv10)
  drm/amd/amdgpu: Don't proceed in audio_fini if disabled (DCEv10)
  drm/amd/amdgpu: Fix indentation in dce_v11_0_crtc_do_set_base()
  drm/amd/amdgpu: Make afmt_init() cleanup if alloc fails (DCEv11)
  ...

1 files changed, 3 insertions, 46 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index 474ca02b0949..1f9109d3348b 100644
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
@@ -3017,7 +3017,6 @@ static int ci_populate_single_memory_level(struct amdgpu_device *adev,
                                                       &memory_level->MinVddcPhases);
 
         memory_level->EnabledForThrottle = 1;
-        memory_level->EnabledForActivity = 1;
         memory_level->UpH = 0;
         memory_level->DownH = 100;
         memory_level->VoltageDownH = 0;
@@ -3376,7 +3375,6 @@ static int ci_populate_single_graphic_level(struct amdgpu_device *adev,
         graphic_level->SpllSpreadSpectrum2 = cpu_to_be32(graphic_level->SpllSpreadSpectrum2);
         graphic_level->CcPwrDynRm = cpu_to_be32(graphic_level->CcPwrDynRm);
         graphic_level->CcPwrDynRm1 = cpu_to_be32(graphic_level->CcPwrDynRm1);
-        graphic_level->EnabledForActivity = 1;
 
         return 0;
 }
@@ -3407,6 +3405,7 @@ static int ci_populate_all_graphic_levels(struct amdgpu_device *adev)
                         pi->smc_state_table.GraphicsLevel[i].DisplayWatermark =
                                 PPSMC_DISPLAY_WATERMARK_HIGH;
         }
+        pi->smc_state_table.GraphicsLevel[0].EnabledForActivity = 1;
 
         pi->smc_state_table.GraphicsDpmLevelCount = (u8)dpm_table->sclk_table.count;
         pi->dpm_level_enable_mask.sclk_dpm_enable_mask =
@@ -3450,6 +3449,8 @@ static int ci_populate_all_memory_levels(struct amdgpu_device *adev)
                         return ret;
         }
 
+        pi->smc_state_table.MemoryLevel[0].EnabledForActivity = 1;
+
         if ((dpm_table->mclk_table.count >= 2) &&
             ((adev->pdev->device == 0x67B0) || (adev->pdev->device == 0x67B1))) {
                 pi->smc_state_table.MemoryLevel[1].MinVddc =
@@ -4381,26 +4382,6 @@ static int ci_dpm_force_performance_level(struct amdgpu_device *adev,
                                 }
                         }
                 }
-                if ((!pi->pcie_dpm_key_disabled) &&
-                    pi->dpm_level_enable_mask.pcie_dpm_enable_mask) {
-                        levels = 0;
-                        tmp = pi->dpm_level_enable_mask.pcie_dpm_enable_mask;
-                        while (tmp >>= 1)
-                                levels++;
-                        if (levels) {
-                                ret = ci_dpm_force_state_pcie(adev, level);
-                                if (ret)
-                                        return ret;
-                                for (i = 0; i < adev->usec_timeout; i++) {
-                                        tmp = (RREG32_SMC(ixTARGET_AND_CURRENT_PROFILE_INDEX_1) &
-                                        TARGET_AND_CURRENT_PROFILE_INDEX_1__CURR_PCIE_INDEX_MASK) >>
-                                        TARGET_AND_CURRENT_PROFILE_INDEX_1__CURR_PCIE_INDEX__SHIFT;
-                                        if (tmp == levels)
-                                                break;
-                                        udelay(1);
-                                }
-                        }
-                }
         } else if (level == AMDGPU_DPM_FORCED_LEVEL_LOW) {
                 if ((!pi->sclk_dpm_key_disabled) &&
                     pi->dpm_level_enable_mask.sclk_dpm_enable_mask) {
@@ -5395,30 +5376,6 @@ static int ci_dpm_enable(struct amdgpu_device *adev)
 
         ci_update_current_ps(adev, boot_ps);
 
-        if (adev->irq.installed &&
-            amdgpu_is_internal_thermal_sensor(adev->pm.int_thermal_type)) {
-#if 0
-                PPSMC_Result result;
-#endif
-                ret = ci_thermal_set_temperature_range(adev, CISLANDS_TEMP_RANGE_MIN,
-                                                       CISLANDS_TEMP_RANGE_MAX);
-                if (ret) {
-                        DRM_ERROR("ci_thermal_set_temperature_range failed\n");
-                        return ret;
-                }
-                amdgpu_irq_get(adev, &adev->pm.dpm.thermal.irq,
-                               AMDGPU_THERMAL_IRQ_LOW_TO_HIGH);
-                amdgpu_irq_get(adev, &adev->pm.dpm.thermal.irq,
-                               AMDGPU_THERMAL_IRQ_HIGH_TO_LOW);
-
-#if 0
-                result = amdgpu_ci_send_msg_to_smc(adev, PPSMC_MSG_EnableThermalInterrupt);
-
-                if (result != PPSMC_Result_OK)
-                        DRM_DEBUG_KMS("Could not enable thermal interrupts.\n");
-#endif
-        }
-
         return 0;
 }