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

- Fix flickering at low backlight levels on some systems
- Fix some overclocking regressions
- Vega20 updates for
- GPU recovery fixes
- Disable gfxoff on RV as some sbios/fw combinations are not stable yet

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181101151939.2828-1-alexander.deucher@amd.com

21 files changed, 207 insertions, 115 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
index 297a5490ad8c..0a4fba196b84 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
@@ -135,7 +135,8 @@ static int acp_poweroff(struct generic_pm_domain *genpd)
          * 2. power off the acp tiles
          * 3. check and enter ulv state
          */
-                if (adev->powerplay.pp_funcs->set_powergating_by_smu)
+                if (adev->powerplay.pp_funcs &&
+                        adev->powerplay.pp_funcs->set_powergating_by_smu)
                         amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, true);
         }
         return 0;
@@ -517,7 +518,8 @@ static int acp_set_powergating_state(void *handle,
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
         bool enable = state == AMD_PG_STATE_GATE ? true : false;
 
-        if (adev->powerplay.pp_funcs->set_powergating_by_smu)
+        if (adev->powerplay.pp_funcs &&
+                adev->powerplay.pp_funcs->set_powergating_by_smu)
                 amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, enable);
 
         return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 1e4dd09a5072..30bc345d6fdf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1493,8 +1493,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
         }
 
         adev->powerplay.pp_feature = amdgpu_pp_feature_mask;
-        if (amdgpu_sriov_vf(adev))
-                adev->powerplay.pp_feature &= ~PP_GFXOFF_MASK;
 
         for (i = 0; i < adev->num_ip_blocks; i++) {
                 if ((amdgpu_ip_block_mask & (1 << i)) == 0) {
@@ -1600,7 +1598,7 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev)
                 }
         }
 
-        if (adev->powerplay.pp_funcs->load_firmware) {
+        if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->load_firmware) {
                 r = adev->powerplay.pp_funcs->load_firmware(adev->powerplay.pp_handle);
                 if (r) {
                         pr_err("firmware loading failed\n");
@@ -3341,7 +3339,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
 
                 kthread_park(ring->sched.thread);
 
-                if (job && job->base.sched == &ring->sched)
+                if (job && job->base.sched != &ring->sched)
                         continue;
 
                 drm_sched_hw_job_reset(&ring->sched, job ? &job->base : NULL);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 28781414d71c..943dbf3c5da1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -114,8 +114,8 @@ uint amdgpu_pg_mask = 0xffffffff;
 uint amdgpu_sdma_phase_quantum = 32;
 char *amdgpu_disable_cu = NULL;
 char *amdgpu_virtual_display = NULL;
-/* OverDrive(bit 14) disabled by default*/
-uint amdgpu_pp_feature_mask = 0xffffbfff;
+/* OverDrive(bit 14),gfxoff(bit 15),stutter mode(bit 17) disabled by default*/
+uint amdgpu_pp_feature_mask = 0xfffd3fff;
 int amdgpu_ngg = 0;
 int amdgpu_prim_buf_per_se = 0;
 int amdgpu_pos_buf_per_se = 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index 790fd5408ddf..1a656b8657f7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -392,7 +392,7 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable)
         if (!(adev->powerplay.pp_feature & PP_GFXOFF_MASK))
                 return;
 
-        if (!adev->powerplay.pp_funcs->set_powergating_by_smu)
+        if (!adev->powerplay.pp_funcs || !adev->powerplay.pp_funcs->set_powergating_by_smu)
                 return;
 
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 94055a485e01..59cc678de8c1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -704,7 +704,10 @@ static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev,
                 return ret;
 
         if (adev->powerplay.pp_funcs->force_clock_level)
-                amdgpu_dpm_force_clock_level(adev, PP_SCLK, mask);
+                ret = amdgpu_dpm_force_clock_level(adev, PP_SCLK, mask);
+
+        if (ret)
+                return -EINVAL;
 
         return count;
 }
@@ -737,7 +740,10 @@ static ssize_t amdgpu_set_pp_dpm_mclk(struct device *dev,
                 return ret;
 
         if (adev->powerplay.pp_funcs->force_clock_level)
-                amdgpu_dpm_force_clock_level(adev, PP_MCLK, mask);
+                ret = amdgpu_dpm_force_clock_level(adev, PP_MCLK, mask);
+
+        if (ret)
+                return -EINVAL;
 
         return count;
 }
@@ -770,7 +776,10 @@ static ssize_t amdgpu_set_pp_dpm_pcie(struct device *dev,
                 return ret;
 
         if (adev->powerplay.pp_funcs->force_clock_level)
-                amdgpu_dpm_force_clock_level(adev, PP_PCIE, mask);
+                ret = amdgpu_dpm_force_clock_level(adev, PP_PCIE, mask);
+
+        if (ret)
+                return -EINVAL;
 
         return count;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 6904d794d60a..352b30409060 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -542,7 +542,8 @@ static void amdgpu_vm_pt_next_leaf(struct amdgpu_device *adev,
                                    struct amdgpu_vm_pt_cursor *cursor)
 {
         amdgpu_vm_pt_next(adev, cursor);
-        while (amdgpu_vm_pt_descendant(adev, cursor));
+        if (cursor->pfn != ~0ll)
+                while (amdgpu_vm_pt_descendant(adev, cursor));
 }
 
 /**
@@ -3234,8 +3235,10 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)
         }
         rbtree_postorder_for_each_entry_safe(mapping, tmp,
                                              &vm->va.rb_root, rb) {
+                /* Don't remove the mapping here, we don't want to trigger a
+                 * rebalance and the tree is about to be destroyed anyway.
+                 */