From: Jani Nikula Date: Fri, 12 Sep 2025 14:48:51 +0000 (+0300) Subject: drm/i915: remove intel_update_czclk() as unnecessary X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3aae3e40190dcd4a49d927ed10c798c05a5627f;p=thirdparty%2Fkernel%2Flinux.git drm/i915: remove intel_update_czclk() as unnecessary With vlv_clock_get_czclk() caching the result on first use, we no longer need a separate initializer. Remove intel_update_czclk() as unnecessary. Log the CZCLK in vlv_clock_get_czclk() instead. v2: Rebase Reviewed-by: Michał Grzelak # v1 Acked-by: Ville Syrjälä Link: https://lore.kernel.org/r/3f90b5e67258f485db09b6f48381682cbd96153f.1757688216.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 8f200593053e4..fb1882494543b 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -190,9 +190,11 @@ int vlv_clock_get_czclk(struct drm_device *drm) { struct drm_i915_private *i915 = to_i915(drm); - if (!i915->czclk_freq) + if (!i915->czclk_freq) { i915->czclk_freq = vlv_get_cck_clock(drm, "czclk", CCK_CZ_CLOCK_CONTROL, vlv_clock_get_hpll_vco(drm)); + drm_dbg_kms(drm, "CZ clock rate: %d kHz\n", i915->czclk_freq); + } return i915->czclk_freq; } @@ -209,18 +211,6 @@ int vlv_clock_get_gpll(struct drm_device *drm) vlv_clock_get_czclk(drm)); } -void intel_update_czclk(struct intel_display *display) -{ - int czclk_freq; - - if (!display->platform.valleyview && !display->platform.cherryview) - return; - - czclk_freq = vlv_clock_get_czclk(display->drm); - - drm_dbg_kms(display->drm, "CZ clock rate: %d kHz\n", czclk_freq); -} - static bool is_hdr_mode(const struct intel_crtc_state *crtc_state) { return (crtc_state->active_planes & diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 5c406b276a766..54961cb656c36 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -528,7 +528,6 @@ void intel_init_display_hooks(struct intel_display *display); void intel_setup_outputs(struct intel_display *display); int intel_initial_commit(struct intel_display *display); void intel_panel_sanitize_ssc(struct intel_display *display); -void intel_update_czclk(struct intel_display *display); enum drm_mode_status intel_mode_valid(struct drm_device *dev, const struct drm_display_mode *mode); int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state, diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index cf1c14412abea..f84a0b26b7a65 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -482,7 +482,6 @@ int intel_display_driver_probe_nogem(struct intel_display *display) intel_dpll_init(display); intel_fdi_pll_freq_update(display); - intel_update_czclk(display); intel_display_driver_init_hw(display); intel_dpll_update_ref_clks(display);