drm/i915: Simplify cdclk_disable_noatomic()

vsyrjala · vsyrjala · commit 003ec4ce424c · 2025-03-07T19:02:52.000+02:00
Instead of hand rolling the cdclk state disabling for a pipe in noatomic() let's just recompute the whole thing from scratch. Less code we have to remember to keep in sync. 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-15-ville.syrjala@linux.intel.com
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -3364,13 +3364,8 @@ void intel_cdclk_update_hw_state(struct intel_display *display)
 void intel_cdclk_crtc_disable_noatomic(struct intel_crtc *crtc)
 {
 	struct intel_display *display = to_intel_display(crtc);
-	struct intel_cdclk_state *cdclk_state =
-		to_intel_cdclk_state(display->cdclk.obj.state);
-	enum pipe pipe = crtc->pipe;
 
-	cdclk_state->min_cdclk[pipe] = 0;
-	cdclk_state->min_voltage_level[pipe] = 0;
-	cdclk_state->active_pipes &= ~BIT(pipe);
+	intel_cdclk_update_hw_state(display);
 }
 
 static int intel_compute_max_dotclk(struct intel_display *display)

Original file line number	Diff line number	Diff line change
`@@ -3364,13 +3364,8 @@ void intel_cdclk_update_hw_state(struct intel_display *display)`
`3364`	`3364`	`void intel_cdclk_crtc_disable_noatomic(struct intel_crtc *crtc)`
`3365`	`3365`	`{`
`3366`	`3366`	`struct intel_display *display = to_intel_display(crtc);`
`3367`		`- struct intel_cdclk_state *cdclk_state =`
`3368`		`- to_intel_cdclk_state(display->cdclk.obj.state);`
`3369`		`- enum pipe pipe = crtc->pipe;`
`3370`	`3367`
`3371`		`- cdclk_state->min_cdclk[pipe] = 0;`
`3372`		`- cdclk_state->min_voltage_level[pipe] = 0;`
`3373`		`- cdclk_state->active_pipes &= ~BIT(pipe);`
	`3368`	`+ intel_cdclk_update_hw_state(display);`
`3374`	`3369`	`}`
`3375`	`3370`
`3376`	`3371`	`static int intel_compute_max_dotclk(struct intel_display *display)`