Skip to content

Commit f0bb81b

Browse files
committed
drm/i915/cdclk: abstract intel_cdclk_read_hw()
Add intel_cdclk_read_hw() function to avoid looking at struct intel_cdclk_state internals outside of intel_cdclk.c. intel_cdclk_init_hw() would be a better name, but we already have that. Reviewed-by: Imre Deak <imre.deak@intel.com> Link: https://lore.kernel.org/r/ef720d37bfeee933d59b64e382dc976f3c9fade1.1750847509.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 082fe69 commit f0bb81b

3 files changed

Lines changed: 14 additions & 7 deletions

File tree

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3869,3 +3869,15 @@ void intel_cdclk_force_min_cdclk(struct intel_cdclk_state *cdclk_state, int forc
38693869
{
38703870
cdclk_state->force_min_cdclk = force_min_cdclk;
38713871
}
3872+
3873+
void intel_cdclk_read_hw(struct intel_display *display)
3874+
{
3875+
struct intel_cdclk_state *cdclk_state;
3876+
3877+
cdclk_state = to_intel_cdclk_state(display->cdclk.obj.state);
3878+
3879+
intel_update_cdclk(display);
3880+
intel_cdclk_dump_config(display, &display->cdclk.hw, "Current CDCLK");
3881+
cdclk_state->actual = display->cdclk.hw;
3882+
cdclk_state->logical = display->cdclk.hw;
3883+
}

drivers/gpu/drm/i915/display/intel_cdclk.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,6 @@ int intel_cdclk_min_cdclk(const struct intel_cdclk_state *cdclk_state, enum pipe
102102
int intel_cdclk_bw_min_cdclk(const struct intel_cdclk_state *cdclk_state);
103103
bool intel_cdclk_pmdemand_needs_update(struct intel_atomic_state *state);
104104
void intel_cdclk_force_min_cdclk(struct intel_cdclk_state *cdclk_state, int force_min_cdclk);
105+
void intel_cdclk_read_hw(struct intel_display *display);
105106

106107
#endif /* __INTEL_CDCLK_H__ */

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,10 @@ bool intel_display_driver_probe_defer(struct pci_dev *pdev)
8484

8585
void intel_display_driver_init_hw(struct intel_display *display)
8686
{
87-
struct intel_cdclk_state *cdclk_state;
88-
8987
if (!HAS_DISPLAY(display))
9088
return;
9189

92-
cdclk_state = to_intel_cdclk_state(display->cdclk.obj.state);
93-
94-
intel_update_cdclk(display);
95-
intel_cdclk_dump_config(display, &display->cdclk.hw, "Current CDCLK");
96-
cdclk_state->logical = cdclk_state->actual = display->cdclk.hw;
90+
intel_cdclk_read_hw(display);
9791

9892
intel_display_wa_apply(display);
9993
}

0 commit comments

Comments
 (0)