Commit be317ca0 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Sprinkle a few missing locks around shared DDI clock registers

The current code attempts to protect the RMWs into global
clock routing registers with a mutex, but forgets to do so
in a few places. Let's remedy that.

Note that at the moment we serialize all modesets onto single
wq, so this shouldn't actually matter. But maybe one day we
wish to attempt parallel modesets again...
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210205214634.19341-10-ville.syrjala@linux.intel.com
parent 7815ed88
...@@ -1929,8 +1929,12 @@ static void cnl_ddi_disable_clock(struct intel_encoder *encoder) ...@@ -1929,8 +1929,12 @@ static void cnl_ddi_disable_clock(struct intel_encoder *encoder)
struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct drm_i915_private *i915 = to_i915(encoder->base.dev);
enum port port = encoder->port; enum port port = encoder->port;
mutex_lock(&i915->dpll.lock);
intel_de_rmw(i915, DPCLKA_CFGCR0, intel_de_rmw(i915, DPCLKA_CFGCR0,
0, DPCLKA_CFGCR0_DDI_CLK_OFF(port)); 0, DPCLKA_CFGCR0_DDI_CLK_OFF(port));
mutex_unlock(&i915->dpll.lock);
} }
static void skl_ddi_enable_clock(struct intel_encoder *encoder, static void skl_ddi_enable_clock(struct intel_encoder *encoder,
...@@ -1959,8 +1963,12 @@ static void skl_ddi_disable_clock(struct intel_encoder *encoder) ...@@ -1959,8 +1963,12 @@ static void skl_ddi_disable_clock(struct intel_encoder *encoder)
struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct drm_i915_private *i915 = to_i915(encoder->base.dev);
enum port port = encoder->port; enum port port = encoder->port;
mutex_lock(&i915->dpll.lock);
intel_de_rmw(i915, DPLL_CTRL2, intel_de_rmw(i915, DPLL_CTRL2,
0, DPLL_CTRL2_DDI_CLK_OFF(port)); 0, DPLL_CTRL2_DDI_CLK_OFF(port));
mutex_unlock(&i915->dpll.lock);
} }
void hsw_ddi_enable_clock(struct intel_encoder *encoder, void hsw_ddi_enable_clock(struct intel_encoder *encoder,
......
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