diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-11-02 17:52:22 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-11-07 12:24:40 +0200 |
| commit | 3fef3e6ff86a405e51f4a7072109147b4b47caca (patch) | |
| tree | 03fda57875c9e39c2b0fc7a8220a7d4b4805c39f | |
| parent | 2b981d57e480e024cde2a0ecb6edee28a8ec39d6 (diff) | |
| download | linux-3fef3e6ff86a405e51f4a7072109147b4b47caca.tar.gz linux-3fef3e6ff86a405e51f4a7072109147b4b47caca.tar.bz2 linux-3fef3e6ff86a405e51f4a7072109147b4b47caca.zip | |
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
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_driver.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_driver.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index 44b59ac301e6..0a5b922f2ad6 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -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); diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 3d86db5638fc..8dead878e51a 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -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); |