Skip to content

Commit 14968c2

Browse files
committed
drm/i915: Do wm readout ealier for skl+
Move the wm readout to happen earlier. This is needed because the bw_state readout will need ddb information populated by the wm readout. For now limit this to skl+ as I've not really analyzed the implications of doing this on other platforms. Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250306163420.3961-17-ville.syrjala@linux.intel.com
1 parent dbf1b1e commit 14968c2

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/gpu/drm/i915/display/intel_modeset_setup.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,6 +880,10 @@ static void intel_modeset_readout_hw_state(struct drm_i915_private *i915)
880880
crtc_state->port_clock);
881881
}
882882

883+
/* TODO move here (or even earlier?) on all platforms */
884+
if (DISPLAY_VER(display) >= 9)
885+
intel_wm_get_hw_state(i915);
886+
883887
intel_bw_update_hw_state(display);
884888
intel_cdclk_update_hw_state(display);
885889

@@ -990,7 +994,9 @@ void intel_modeset_setup_hw_state(struct drm_i915_private *i915,
990994

991995
intel_dpll_sanitize_state(display);
992996

993-
intel_wm_get_hw_state(i915);
997+
/* TODO move earlier on all platforms */
998+
if (DISPLAY_VER(display) < 9)
999+
intel_wm_get_hw_state(i915);
9941000
intel_wm_sanitize(i915);
9951001

9961002
for_each_intel_crtc(&i915->drm, crtc) {

0 commit comments

Comments
 (0)