From: Maxime Ripard <mripard@kernel.org>
Date: Thu, 6 Feb 2025 12:47:32 +0000 (+0100)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Tag: v6.15-rc1~120^2~20^2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93c7dd1b39444ebd5a6a98e56a363d7a4e646775;p=thirdparty%2Flinux.git

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

Bring rc1 to start the new release dev.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
---

93c7dd1b39444ebd5a6a98e56a363d7a4e646775
diff --cc drivers/gpu/drm/i915/display/intel_crt.c
index 69667cd49ec84,4634d3fd9f201..968ac705c3c6a
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@@ -352,11 -358,10 +358,10 @@@ static void intel_enable_crt(struct int
  
  static enum drm_mode_status
  intel_crt_mode_valid(struct drm_connector *connector,
 -		     struct drm_display_mode *mode)
 +		     const struct drm_display_mode *mode)
  {
  	struct intel_display *display = to_intel_display(connector->dev);
- 	struct drm_device *dev = connector->dev;
- 	struct drm_i915_private *dev_priv = to_i915(dev);
+ 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
  	int max_dotclk = display->cdclk.max_dotclk_freq;
  	enum drm_mode_status status;
  	int max_clock;
diff --cc drivers/gpu/drm/i915/display/intel_ddi.c
index a70e7f263a899,acb986bc1f33a..0aec4b958af65
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@@ -2546,7 -2594,7 +2594,8 @@@ static void mtl_ddi_pre_enable_dp(struc
  {
  	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
  	bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
 +	bool transparent_mode;
+ 	int ret;
  
  	intel_dp_set_link_params(intel_dp,
  				 crtc_state->port_clock,
diff --cc drivers/gpu/drm/i915/display/intel_dp.c
index ea4f775b12a1d,f1f3b1bb1e89b..1ad25c37f3c24
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@@ -1371,8 -1391,9 +1391,9 @@@ bool intel_dp_has_dsc(const struct inte
  
  static enum drm_mode_status
  intel_dp_mode_valid(struct drm_connector *_connector,
 -		    struct drm_display_mode *mode)
 +		    const struct drm_display_mode *mode)
  {
+ 	struct intel_display *display = to_intel_display(_connector->dev);
  	struct intel_connector *connector = to_intel_connector(_connector);
  	struct intel_dp *intel_dp = intel_attached_dp(connector);
  	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c
index 0812a3fd8b376,0c44fc7dd86ce..227bd2783e641
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@@ -1431,8 -1418,8 +1418,8 @@@ static int mst_connector_get_modes(stru
  }
  
  static int
- intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
+ mst_connector_mode_valid_ctx(struct drm_connector *connector,
 -			     struct drm_display_mode *mode,
 +			     const struct drm_display_mode *mode,
  			     struct drm_modeset_acquire_ctx *ctx,
  			     enum drm_mode_status *status)
  {