Commit 7880d41c authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Extract _intel_{enable,disable}_shared_dpll()

We have a bit of duplicated code around the DPLL disabling. Extract
that to a new function, and for symmetry also do the same for the
enable direction.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231012123522.26045-5-ville.syrjala@linux.intel.comReviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 3e7e07c4
...@@ -219,6 +219,26 @@ intel_tc_pll_enable_reg(struct drm_i915_private *i915, ...@@ -219,6 +219,26 @@ intel_tc_pll_enable_reg(struct drm_i915_private *i915,
return MG_PLL_ENABLE(tc_port); return MG_PLL_ENABLE(tc_port);
} }
static void _intel_enable_shared_dpll(struct drm_i915_private *i915,
struct intel_shared_dpll *pll)
{
if (pll->info->power_domain)
pll->wakeref = intel_display_power_get(i915, pll->info->power_domain);
pll->info->funcs->enable(i915, pll);
pll->on = true;
}
static void _intel_disable_shared_dpll(struct drm_i915_private *i915,
struct intel_shared_dpll *pll)
{
pll->info->funcs->disable(i915, pll);
pll->on = false;
if (pll->info->power_domain)
intel_display_power_put(i915, pll->info->power_domain, pll->wakeref);
}
/** /**
* intel_enable_shared_dpll - enable a CRTC's shared DPLL * intel_enable_shared_dpll - enable a CRTC's shared DPLL
* @crtc_state: CRTC, and its state, which has a shared DPLL * @crtc_state: CRTC, and its state, which has a shared DPLL
...@@ -259,11 +279,7 @@ void intel_enable_shared_dpll(const struct intel_crtc_state *crtc_state) ...@@ -259,11 +279,7 @@ void intel_enable_shared_dpll(const struct intel_crtc_state *crtc_state)
drm_dbg_kms(&i915->drm, "enabling %s\n", pll->info->name); drm_dbg_kms(&i915->drm, "enabling %s\n", pll->info->name);
if (pll->info->power_domain) _intel_enable_shared_dpll(i915, pll);
pll->wakeref = intel_display_power_get(i915, pll->info->power_domain);
pll->info->funcs->enable(i915, pll);
pll->on = true;
out: out:
mutex_unlock(&i915->display.dpll.lock); mutex_unlock(&i915->display.dpll.lock);
...@@ -308,11 +324,8 @@ void intel_disable_shared_dpll(const struct intel_crtc_state *crtc_state) ...@@ -308,11 +324,8 @@ void intel_disable_shared_dpll(const struct intel_crtc_state *crtc_state)
goto out; goto out;
drm_dbg_kms(&i915->drm, "disabling %s\n", pll->info->name); drm_dbg_kms(&i915->drm, "disabling %s\n", pll->info->name);
pll->info->funcs->disable(i915, pll);
pll->on = false;
if (pll->info->power_domain) _intel_disable_shared_dpll(i915, pll);
intel_display_power_put(i915, pll->info->power_domain, pll->wakeref);
out: out:
mutex_unlock(&i915->display.dpll.lock); mutex_unlock(&i915->display.dpll.lock);
...@@ -4408,11 +4421,7 @@ static void sanitize_dpll_state(struct drm_i915_private *i915, ...@@ -4408,11 +4421,7 @@ static void sanitize_dpll_state(struct drm_i915_private *i915,
"%s enabled but not in use, disabling\n", "%s enabled but not in use, disabling\n",
pll->info->name); pll->info->name);
pll->info->funcs->disable(i915, pll); _intel_disable_shared_dpll(i915, pll);
pll->on = false;
if (pll->info->power_domain)
intel_display_power_put(i915, pll->info->power_domain, pll->wakeref);
} }
void intel_dpll_sanitize_state(struct drm_i915_private *i915) void intel_dpll_sanitize_state(struct drm_i915_private *i915)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment