From: Dave Airlie <airlied@redhat.com>
Date: Mon, 28 Feb 2022 04:57:14 +0000 (+1000)
Subject: Backmerge tag 'v5.17-rc6' into drm-next
X-Git-Tag: v5.18-rc1~134^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c64ae228f0826859c56711ce133aff037d6205f;p=thirdparty%2Flinux.git

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>
---

6c64ae228f0826859c56711ce133aff037d6205f
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 9e5fc4cdb8ec9,c4387b38229c2..937176122a05d
--- a/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/drm_edid.c
index a7663f9a11d2c,f5f5de362ff2c..561f53831e291
--- a/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/tegra/Kconfig
index 18c319b804c00,201f5175ecfec..6ed55ebaec8c0
--- a/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 8ca500977a46b,d7a731d287d23..5847dcad24785
--- a/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"