From: Stephen Rothwell Date: Tue, 25 Feb 2025 01:12:36 +0000 (+1100) Subject: Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel X-Git-Tag: next-20250225~93 X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=ecff667181c450e01026c2a2d24da41db2248309;p=linux%2F.git Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel # Conflicts: # drivers/gpu/drm/i915/display/intel_dp.c # drivers/gpu/drm/i915/display/intel_dp_mst.c # drivers/gpu/drm/i915/i915_reg.h --- ecff667181c450e01026c2a2d24da41db2248309 diff --cc drivers/gpu/drm/i915/display/icl_dsi.c index 9ed0924cc0fb,c1b5be0f5603..5d3d54922d62 --- a/drivers/gpu/drm/i915/display/icl_dsi.c +++ b/drivers/gpu/drm/i915/display/icl_dsi.c @@@ -1460,12 -1455,12 +1455,12 @@@ static void gen11_dsi_post_disable(stru } static enum drm_mode_status gen11_dsi_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) + const struct drm_display_mode *mode) { - struct drm_i915_private *i915 = to_i915(connector->dev); + struct intel_display *display = to_intel_display(connector->dev); enum drm_mode_status status; - status = intel_cpu_transcoder_mode_valid(i915, mode); + status = intel_cpu_transcoder_mode_valid(display, mode); if (status != MODE_OK) return status; diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c index aecaaf1d0fe2,faa261c8930c..167e4a70ab12 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@@ -1422,8 -1455,8 +1455,8 @@@ static int mst_connector_get_modes(stru } static int - mst_connector_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) { diff --cc drivers/gpu/drm/i915/display/intel_dsi.c index c93a3cf75c52,56a5a517496d..403151175a87 --- a/drivers/gpu/drm/i915/display/intel_dsi.c +++ b/drivers/gpu/drm/i915/display/intel_dsi.c @@@ -58,9 -58,9 +58,9 @@@ int intel_dsi_get_modes(struct drm_conn } enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) + const struct drm_display_mode *mode) { - struct drm_i915_private *dev_priv = to_i915(connector->dev); + struct intel_display *display = to_intel_display(connector->dev); struct intel_connector *intel_connector = to_intel_connector(connector); const struct drm_display_mode *fixed_mode = intel_panel_fixed_mode(intel_connector, mode); diff --cc drivers/gpu/drm/i915/display/intel_dvo.c index c310698a1a86,0e5728dc09b2..c16fb34b737d --- a/drivers/gpu/drm/i915/display/intel_dvo.c +++ b/drivers/gpu/drm/i915/display/intel_dvo.c @@@ -217,10 -217,10 +217,10 @@@ static void intel_enable_dvo(struct int static enum drm_mode_status intel_dvo_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 drm_i915_private *i915 = to_i915(connector->base.dev); struct intel_dvo *intel_dvo = intel_attached_dvo(connector); const struct drm_display_mode *fixed_mode = intel_panel_fixed_mode(connector, mode); diff --cc drivers/gpu/drm/i915/display/intel_lvds.c index 4b0dce169d4e,12bbd7ec9d81..7ed8625193fe --- a/drivers/gpu/drm/i915/display/intel_lvds.c +++ b/drivers/gpu/drm/i915/display/intel_lvds.c @@@ -390,16 -392,16 +392,16 @@@ static void intel_lvds_shutdown(struct static enum drm_mode_status intel_lvds_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 drm_i915_private *i915 = to_i915(connector->base.dev); const struct drm_display_mode *fixed_mode = intel_panel_fixed_mode(connector, mode); - int max_pixclk = to_i915(connector->base.dev)->display.cdclk.max_dotclk_freq; + int max_pixclk = display->cdclk.max_dotclk_freq; enum drm_mode_status status; - status = intel_cpu_transcoder_mode_valid(i915, mode); + status = intel_cpu_transcoder_mode_valid(display, mode); if (status != MODE_OK) return status; diff --cc drivers/gpu/drm/i915/display/intel_sdvo.c index 1b6040892c40,efb439f1f6a0..6e2d9929b4d7 --- a/drivers/gpu/drm/i915/display/intel_sdvo.c +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c @@@ -1938,9 -1940,9 +1940,9 @@@ static void intel_enable_sdvo(struct in static enum drm_mode_status intel_sdvo_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) + const struct drm_display_mode *mode) { - struct drm_i915_private *i915 = to_i915(connector->dev); + struct intel_display *display = to_intel_display(connector->dev); struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector)); struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector); diff --cc drivers/gpu/drm/i915/display/intel_tv.c index 1c50732a099d,5964d1279a41..5dbe857ea85b --- a/drivers/gpu/drm/i915/display/intel_tv.c +++ b/drivers/gpu/drm/i915/display/intel_tv.c @@@ -957,10 -957,9 +957,9 @@@ static const struct tv_mode *intel_tv_m static enum drm_mode_status intel_tv_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_i915_private *i915 = to_i915(connector->dev); const struct tv_mode *tv_mode = intel_tv_mode_find(connector->state); int max_dotclk = display->cdclk.max_dotclk_freq; enum drm_mode_status status; diff --cc drivers/gpu/drm/i915/display/vlv_dsi.c index c4d731ab28eb,03ba63c0032b..7414794889e9 --- a/drivers/gpu/drm/i915/display/vlv_dsi.c +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c @@@ -1541,14 -1541,14 +1541,14 @@@ static const struct drm_encoder_funcs i }; static enum drm_mode_status vlv_dsi_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) + const struct drm_display_mode *mode) { - struct drm_i915_private *i915 = to_i915(connector->dev); + struct intel_display *display = to_intel_display(connector->dev); - if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) { + if (display->platform.valleyview || display->platform.cherryview) { enum drm_mode_status status; - status = intel_cpu_transcoder_mode_valid(i915, mode); + status = intel_cpu_transcoder_mode_valid(display, mode); if (status != MODE_OK) return status; }