mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
drm/i915: move display mutex inits to display code
The core code has no business accessing i915->display directly. These could be further spread to respective files, but this is a start. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231102155223.2298316-1-jani.nikula@intel.com
This commit is contained in:
parent
2b981d57e4
commit
3fef3e6ff8
2 changed files with 6 additions and 6 deletions
|
@ -181,6 +181,12 @@ void intel_display_driver_early_probe(struct drm_i915_private *i915)
|
|||
if (!HAS_DISPLAY(i915))
|
||||
return;
|
||||
|
||||
mutex_init(&i915->display.backlight.lock);
|
||||
mutex_init(&i915->display.audio.mutex);
|
||||
mutex_init(&i915->display.wm.wm_mutex);
|
||||
mutex_init(&i915->display.pps.mutex);
|
||||
mutex_init(&i915->display.hdcp.hdcp_mutex);
|
||||
|
||||
intel_display_irq_init(i915);
|
||||
intel_dkl_phy_init(i915);
|
||||
intel_color_init_hooks(i915);
|
||||
|
|
|
@ -230,16 +230,10 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
|
|||
|
||||
spin_lock_init(&dev_priv->irq_lock);
|
||||
spin_lock_init(&dev_priv->gpu_error.lock);
|
||||
mutex_init(&dev_priv->display.backlight.lock);
|
||||
|
||||
mutex_init(&dev_priv->sb_lock);
|
||||
cpu_latency_qos_add_request(&dev_priv->sb_qos, PM_QOS_DEFAULT_VALUE);
|
||||
|
||||
mutex_init(&dev_priv->display.audio.mutex);
|
||||
mutex_init(&dev_priv->display.wm.wm_mutex);
|
||||
mutex_init(&dev_priv->display.pps.mutex);
|
||||
mutex_init(&dev_priv->display.hdcp.hdcp_mutex);
|
||||
|
||||
i915_memcpy_init_early(dev_priv);
|
||||
intel_runtime_pm_init_early(&dev_priv->runtime_pm);
|
||||
|
||||
|
|
Loading…
Reference in a new issue