Merge tag 'drm-next-2020-10-19' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "Some fixes queued up already for i915 and amdgpu, I've also included
  the fix for the clang warning you've seen.

  i915:
   - set all unused color plane offsets to ~0xfff again (Ville)
   - fix TGL DKL PHY DP vswing handling (Ville)

  amdgpu:
   - DCN clang warning fix
   - eDP fix
   - BACO fix
   - kernel documentation fixes
   - SMU7 mclk fix
   - VCN1 hw bug workaround

  amdkfd:
   - kvfree vs kfree fix"

* tag 'drm-next-2020-10-19' of git://anongit.freedesktop.org/drm/drm:
  drm/amd/display: Fix incorrect dsc force enable logic
  drm/amdkfd: Use kvfree in destroy_crat_image
  drm/amdgpu: vcn and jpeg ring synchronization
  drm/amd/pm: increase mclk switch threshold to 200 us
  docs: amdgpu: fix a warning when building the documentation
  drm/amd/display: kernel-doc: document force_timing_sync
  drm/amdgpu/swsmu: init the baco mutex in early_init
  drm/amd/display: Fix module load hangs when connected to an eDP
  drm/i915: Set all unused color plane offsets to ~0xfff again
  drm/i915: Fix TGL DKL PHY DP vswing handling

diff --combined drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 9427939,b1e5ec0..fc4f95f
--- 1/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
--- 2/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@@ -417,6 -417,9 +417,9 @@@ static int smu_early_init(void *handle
        smu->pm_enabled = !!amdgpu_dpm;
        smu->is_apu = false;
        mutex_init(&smu->mutex);
+       mutex_init(&smu->smu_baco.mutex);
+       smu->smu_baco.state = SMU_BACO_STATE_EXIT;
+       smu->smu_baco.platform_support = false;
  
        return smu_set_funcs(adev);
  }
@@@ -795,10 -798,6 +798,6 @@@ static int smu_sw_init(void *handle
        bitmap_zero(smu->smu_feature.enabled, SMU_FEATURE_MAX);
        bitmap_zero(smu->smu_feature.allowed, SMU_FEATURE_MAX);
  
-       mutex_init(&smu->smu_baco.mutex);
-       smu->smu_baco.state = SMU_BACO_STATE_EXIT;
-       smu->smu_baco.platform_support = false;
- 
        mutex_init(&smu->sensor_lock);
        mutex_init(&smu->metrics_lock);
        mutex_init(&smu->message_lock);
@@@ -1027,17 -1026,6 +1026,17 @@@ static int smu_smc_hw_setup(struct smu_
        ret = smu_set_default_dpm_table(smu);
        if (ret) {
                dev_err(adev->dev, "Failed to setup default dpm clock tables!\n");
 +              return ret;
 +      }
 +
 +      /*
 +       * Set initialized values (get from vbios) to dpm tables context such as
 +       * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each
 +       * type of clks.
 +       */
 +      ret = smu_set_default_dpm_table(smu);
 +      if (ret) {
 +              dev_err(adev->dev, "Failed to setup default dpm clock tables!\n");
                return ret;
        }