From: Maxime Ripard <maxime@cerno.tech>
Date: Tue, 18 Oct 2022 13:00:03 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a140a6a2d5ec0329ad05cd3532a91ad0ce58dceb;p=linux.git

Merge drm/drm-next into drm-misc-next

Let's kick-off this release cycle.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---

a140a6a2d5ec0329ad05cd3532a91ad0ce58dceb
diff --cc drivers/gpu/drm/Makefile
index 6ad98d3ceff76,0b283e46f28b8..6e55c47288e42
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -3,59 -3,26 +3,61 @@@
  # Makefile for the drm device driver.  This driver provides support for the
  # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
  
+ CFLAGS-$(CONFIG_DRM_USE_DYNAMIC_DEBUG)	+= -DDYNAMIC_DEBUG_MODULE
+ 
 -drm-y       :=	drm_aperture.o drm_auth.o drm_cache.o \
 -		drm_file.o drm_gem.o drm_ioctl.o \
 -		drm_drv.o \
 -		drm_sysfs.o drm_mm.o \
 -		drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o drm_displayid.o \
 -		drm_trace_points.o drm_prime.o \
 -		drm_vma_manager.o \
 -		drm_modeset_lock.o drm_atomic.o drm_bridge.o \
 -		drm_framebuffer.o drm_connector.o drm_blend.o \
 -		drm_encoder.o drm_mode_object.o drm_property.o \
 -		drm_plane.o drm_color_mgmt.o drm_print.o \
 -		drm_dumb_buffers.o drm_mode_config.o drm_vblank.o \
 -		drm_syncobj.o drm_lease.o drm_writeback.o drm_client.o \
 -		drm_client_modeset.o drm_atomic_uapi.o \
 -		drm_managed.o drm_vblank_work.o
 -drm-$(CONFIG_DRM_LEGACY) += drm_agpsupport.o drm_bufs.o drm_context.o drm_dma.o \
 -			    drm_hashtab.o drm_irq.o drm_legacy_misc.o drm_lock.o \
 -			    drm_memory.o drm_scatter.o drm_vm.o
 +drm-y := \
 +	drm_aperture.o \
 +	drm_atomic.o \
 +	drm_atomic_uapi.o \
 +	drm_auth.o \
 +	drm_blend.o \
 +	drm_bridge.o \
 +	drm_cache.o \
 +	drm_client.o \
 +	drm_client_modeset.o \
 +	drm_color_mgmt.o \
 +	drm_connector.o \
 +	drm_crtc.o \
 +	drm_displayid.o \
 +	drm_drv.o \
 +	drm_dumb_buffers.o \
 +	drm_edid.o \
 +	drm_encoder.o \
 +	drm_file.o \
 +	drm_fourcc.o \
 +	drm_framebuffer.o \
 +	drm_gem.o \
 +	drm_ioctl.o \
 +	drm_lease.o \
 +	drm_managed.o \
 +	drm_mm.o \
 +	drm_mode_config.o \
 +	drm_mode_object.o \
 +	drm_modes.o \
 +	drm_modeset_lock.o \
 +	drm_plane.o \
 +	drm_prime.o \
 +	drm_print.o \
 +	drm_property.o \
 +	drm_syncobj.o \
 +	drm_sysfs.o \
 +	drm_trace_points.o \
 +	drm_vblank.o \
 +	drm_vblank_work.o \
 +	drm_vma_manager.o \
 +	drm_writeback.o
 +drm-$(CONFIG_DRM_LEGACY) += \
 +	drm_agpsupport.o \
 +	drm_bufs.o \
 +	drm_context.o \
 +	drm_dma.o \
 +	drm_hashtab.o \
 +	drm_irq.o \
 +	drm_legacy_misc.o \
 +	drm_lock.o \
 +	drm_memory.o \
 +	drm_scatter.o \
 +	drm_vm.o
  drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o
  drm-$(CONFIG_COMPAT) += drm_ioc32.o
  drm-$(CONFIG_DRM_PANEL) += drm_panel.o
diff --cc drivers/gpu/drm/drm_edid.c
index 73c614efc1328,4005dab6147d9..47465b9765f1a
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@@ -6141,16 -6055,16 +6150,19 @@@ void get_monitor_range(const struct det
  static void drm_get_monitor_range(struct drm_connector *connector,
  				  const struct drm_edid *drm_edid)
  {
- 	struct drm_display_info *info = &connector->display_info;
+ 	const struct drm_display_info *info = &connector->display_info;
+ 	struct detailed_mode_closure closure = {
+ 		.connector = connector,
+ 		.drm_edid = drm_edid,
+ 	};
  
 -	if (!version_greater(drm_edid, 1, 1))
 +	if (drm_edid->edid->revision < 4)
 +		return;
 +
 +	if (!(drm_edid->edid->features & DRM_EDID_FEATURE_CONTINUOUS_FREQ))
  		return;
  
- 	drm_for_each_detailed_block(drm_edid, get_monitor_range,
- 				    &info->monitor_range);
+ 	drm_for_each_detailed_block(drm_edid, get_monitor_range, &closure);
  
  	DRM_DEBUG_KMS("Supported Monitor Refresh rate range is %d Hz - %d Hz\n",
  		      info->monitor_range.min_vfreq,
diff --cc include/drm/drm_edid.h
index 28dd80343afa9,1ed61e2b30a41..429735b91f632
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@@ -92,13 -92,15 +92,18 @@@ struct detailed_data_string 
  	u8 str[13];
  } __attribute__((packed));
  
+ #define DRM_EDID_RANGE_OFFSET_MIN_VFREQ (1 << 0) /* 1.4 */
+ #define DRM_EDID_RANGE_OFFSET_MAX_VFREQ (1 << 1) /* 1.4 */
+ #define DRM_EDID_RANGE_OFFSET_MIN_HFREQ (1 << 2) /* 1.4 */
+ #define DRM_EDID_RANGE_OFFSET_MAX_HFREQ (1 << 3) /* 1.4 */
+ 
 -#define DRM_EDID_DEFAULT_GTF_SUPPORT_FLAG   0x00
 -#define DRM_EDID_RANGE_LIMITS_ONLY_FLAG     0x01
 -#define DRM_EDID_SECONDARY_GTF_SUPPORT_FLAG 0x02
 -#define DRM_EDID_CVT_SUPPORT_FLAG           0x04
 +#define DRM_EDID_DEFAULT_GTF_SUPPORT_FLAG   0x00 /* 1.3 */
 +#define DRM_EDID_RANGE_LIMITS_ONLY_FLAG     0x01 /* 1.4 */
 +#define DRM_EDID_SECONDARY_GTF_SUPPORT_FLAG 0x02 /* 1.3 */
 +#define DRM_EDID_CVT_SUPPORT_FLAG           0x04 /* 1.4 */
 +
 +#define DRM_EDID_CVT_FLAGS_STANDARD_BLANKING (1 << 3)
 +#define DRM_EDID_CVT_FLAGS_REDUCED_BLANKING  (1 << 4)
  
  struct detailed_data_monitor_range {
  	u8 min_vfreq;