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>

diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index 00e97bd1bbe36f43af2078b09a439f5e4e61da61..488fffa059d6786815bbad2e9f63b5bed1d1391a 100644 (file)
--- 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);
 }
 
 /**