diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-09-21 15:23:40 +0300 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-09-26 20:42:59 +0300 |
commit | 8a549e8d19f401a717f72cc035f5df6b4d128564 (patch) | |
tree | dc4e7bbe07e0bccf75df5dec779cb2832e3d726f /drivers | |
parent | 073a12f45fb8e3b21c9e08c36a2528d9f9e38d83 (diff) | |
download | linux-8a549e8d19f401a717f72cc035f5df6b4d128564.tar.gz linux-8a549e8d19f401a717f72cc035f5df6b4d128564.tar.bz2 linux-8a549e8d19f401a717f72cc035f5df6b4d128564.zip |
drm/i915: Always initialize dpll.lock
Initialize the dll.lock mutex whether or not we manage to
initialize the rest of the dpll mgr.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220921122343.13061-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c index 00e97bd1bbe3..488fffa059d6 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c @@ -4193,6 +4193,8 @@ void intel_shared_dpll_init(struct drm_i915_private *dev_priv) const struct dpll_info *dpll_info; int i; + mutex_init(&dev_priv->display.dpll.lock); + if (IS_DG2(dev_priv)) /* No shared DPLLs on DG2; port PLLs are part of the PHY */ dpll_mgr = NULL; @@ -4237,7 +4239,6 @@ void intel_shared_dpll_init(struct drm_i915_private *dev_priv) dev_priv->display.dpll.mgr = dpll_mgr; dev_priv->display.dpll.num_shared_dpll = i; - mutex_init(&dev_priv->display.dpll.lock); } /** |