Merge tag 'amd-drm-fixes-6.0-2022-08-17' of https://gitlab.freedesktop.org/agd5f...

amd-drm-fixes-6.0-2022-08-17:

amdgpu:
- Revert some DML stack changes
- Rounding fixes in KFD allocations
- atombios vram info table parsing fix
- DCN 3.1.4 fixes
- Clockgating fixes for various new IPs
- SMU 13.0.4 fixes
- DCN 3.1.4 FP fixes
- TMDS fixes for YCbCr420 4k modes
- DCN 3.2.x fixes
- USB 4 fixes
- SMU 13.0 fixes
- SMU driver unload memory leak fixes
- Display orientation fix
- Regression fix for generic fbdev conversion
- SDMA 6.x fixes
- SR-IOV fixes
- IH 6.x fixes
- Use after free fix in bo list handling
- Revert pipe1 support
- XGMI hive reset fix

amdkfd:
- Fix potential crach in kfd_create_indirect_link_prop()

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

diff --combined drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
index 726a5bba40b2023694bafbc5826e4729d6ee6cfa,e8e0004bbb7aa35a8a359e3da159c0cbd225fe2a..a75a286e1ecf37e0927ec05cdfcf7a15f7a3d582
--- 1/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
--- 2/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
@@@ -20,9 -20,7 +20,8 @@@
   * OTHER DEALINGS IN THE SOFTWARE.
   *
   */
- #include <linux/dev_printk.h>
  #include <drm/drm_drv.h>
 +#include <linux/vmalloc.h>
  #include "amdgpu.h"
  #include "amdgpu_psp.h"
  #include "amdgpu_ucode.h"

diff --combined drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
index b841b8b0a9d82074a3699f523ba8013a1277631c,7e95232e93fe8dca3065bee2eb9b69244006ecc8..fca7cf9dbaeec50a42f5591409f325bc7f0eeade
--- 1/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
--- 2/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
@@@ -660,7 -660,7 +660,7 @@@ static int get_plane_modifiers(struct a
                        add_gfx10_1_modifiers(adev, mods, &size, &capacity);
                break;
        case AMDGPU_FAMILY_GC_11_0_0:
-       case AMDGPU_FAMILY_GC_11_0_2:
+       case AMDGPU_FAMILY_GC_11_0_1:
                add_gfx11_modifiers(adev, mods, &size, &capacity);
                break;
        }
@@@ -1412,7 -1412,7 +1412,7 @@@ static bool dm_plane_format_mod_support
                }
                break;
        case AMDGPU_FAMILY_GC_11_0_0:
-       case AMDGPU_FAMILY_GC_11_0_2:
+       case AMDGPU_FAMILY_GC_11_0_1:
                switch (AMD_FMT_MOD_GET(TILE, modifier)) {
                case AMD_FMT_MOD_TILE_GFX11_256K_R_X:
                case AMD_FMT_MOD_TILE_GFX9_64K_R_X:
@@@ -1591,9 -1591,6 +1591,9 @@@ int amdgpu_dm_plane_init(struct amdgpu_
        if (res)
                return res;
  
 +      if (modifiers == NULL)
 +              adev_to_drm(dm->adev)->mode_config.fb_modifiers_not_supported = true;
 +
        res = drm_universal_plane_init(adev_to_drm(dm->adev), plane, possible_crtcs,
                                       &dm_plane_funcs, formats, num_formats,
                                       modifiers, plane->type, NULL);