Backmerge tag 'v5.17-rc6' into drm-next

This backmerges v5.17-rc6 so I can merge some amdgpu and some tegra changes on top.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 9e5fc4cdb8ec95428c514b99f24fc8a5c69f8334,c4387b38229c2570b9afe424a97e359e23338709..937176122a05df2091b7add0c83a66a0ab5073bc
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@@ -1148,7 -1141,7 +1148,7 @@@ int amdgpu_display_framebuffer_init(str
        if (ret)
                return ret;
  
-       if (dev->mode_config.fb_modifiers_not_supported) {
 -      if (!dev->mode_config.allow_fb_modifiers && !adev->enable_virtual_display) {
++      if (dev->mode_config.fb_modifiers_not_supported && !adev->enable_virtual_display) {
                drm_WARN_ONCE(dev, adev->family >= AMDGPU_FAMILY_AI,
                              "GFX9+ requires FB check based on format modifier\n");
                ret = check_tiling_flags_gfx6(rfb);

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/soc15.c
Simple merge

diff --cc drivers/gpu/drm/drm_edid.c
index a7663f9a11d2c95bdd3962484c9ba83712a09d6f,f5f5de362ff2c722734fea68c6c17885e03510e2..561f53831e2915e69a0734d29444c5870cdfe099
--- 1/drivers/gpu/drm/drm_edid.c
--- 2/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@@ -5361,14 -5333,19 +5361,15 @@@ u32 drm_add_display_info(struct drm_con
        info->width_mm = edid->width_cm * 10;
        info->height_mm = edid->height_cm * 10;
  
 -      info->non_desktop = !!(quirks & EDID_QUIRK_NON_DESKTOP);
 -
        drm_get_monitor_range(connector, edid);
  
 -      DRM_DEBUG_KMS("non_desktop set to %d\n", info->non_desktop);
 -
        if (edid->revision < 3)
 -              return quirks;
 +              goto out;
  
        if (!(edid->input & DRM_EDID_INPUT_DIGITAL))
 -              return quirks;
 +              goto out;
  
+       info->color_formats |= DRM_COLOR_FORMAT_RGB444;
        drm_parse_cea_ext(connector, edid);
  
        /*
@@@ -5417,11 -5394,10 +5418,10 @@@
        DRM_DEBUG("%s: Assigning EDID-1.4 digital sink color depth as %d bpc.\n",
                          connector->name, info->bpc);
  
-       info->color_formats |= DRM_COLOR_FORMAT_RGB444;
        if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB444)
 -              info->color_formats |= DRM_COLOR_FORMAT_YCRCB444;
 +              info->color_formats |= DRM_COLOR_FORMAT_YCBCR444;
        if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB422)
 -              info->color_formats |= DRM_COLOR_FORMAT_YCRCB422;
 +              info->color_formats |= DRM_COLOR_FORMAT_YCBCR422;
  
        drm_update_mso(connector, edid);
  

diff --cc drivers/gpu/drm/drm_gem_cma_helper.c
Simple merge

diff --cc drivers/gpu/drm/i915/Kconfig
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/gtt.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_dsi.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_uvd.c
Simple merge

diff --cc drivers/gpu/drm/tegra/Kconfig
index 18c319b804c00ed6209af7d0864d4299c1c21cca,201f5175ecfec7a5d4a711fe64ed54e9d0cae5f1..6ed55ebaec8c0838654aae959457d9a691aa5d56
--- 1/drivers/gpu/drm/tegra/Kconfig
--- 2/drivers/gpu/drm/tegra/Kconfig
+++ b/drivers/gpu/drm/tegra/Kconfig
@@@ -5,7 -5,7 +5,8 @@@ config DRM_TEGR
        depends on COMMON_CLK
        depends on DRM
        depends on OF
+       select DRM_DP_AUX_BUS
 +      select DRM_DP_HELPER
        select DRM_KMS_HELPER
        select DRM_MIPI_DSI
        select DRM_PANEL

diff --cc drivers/gpu/drm/tegra/dpaux.c
index 8ca500977a46b83f293244df08484c1eef3786ef,d7a731d287d2344dcab9aa7be0dcd8e2dfc4997d..5847dcad24785549bd872178a3501ec0d9fe9ec7
--- 1/drivers/gpu/drm/tegra/dpaux.c
--- 2/drivers/gpu/drm/tegra/dpaux.c
+++ b/drivers/gpu/drm/tegra/dpaux.c
@@@ -18,7 -18,8 +18,8 @@@
  #include <linux/reset.h>
  #include <linux/workqueue.h>
  
 -#include <drm/drm_dp_helper.h>
 -#include <drm/drm_dp_aux_bus.h>
 +#include <drm/dp/drm_dp_helper.h>
++#include <drm/dp/drm_dp_aux_bus.h>
  #include <drm/drm_panel.h>
  
  #include "dp.h"

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.h
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge