History

drm/i915: initialize gt_lock early with other spin locks

commit 181d1b9e31c668259d3798c521672afb8edd355c Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Sun Jul 21 13:16:24 2013 +0200 drm/i915: fix up gt init sequence fallout moved dev_priv->gt_lock initialization after use. Do the initialization much earlier with other spin lock initializations.

Jani Nikula committed 13 years ago

Commit 14c5cec1 parent 7d148ef2 files · +1 −2Browse files

Unified · Split

2 files
  1. drivers/gpu/drm/i915/i915_dma.c +1 −0
  2. drivers/gpu/drm/i915/intel_pm.c +0 −2
drivers/gpu/drm/i915/i915_dma.c+1−0
@@ -1498,6 +1498,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) · 1497 unmodified lines
1498 spin_lock_init(&dev_priv->irq_lock);1498 spin_lock_init(&dev_priv->irq_lock);
1499 spin_lock_init(&dev_priv->gpu_error.lock);1499 spin_lock_init(&dev_priv->gpu_error.lock);
1500 spin_lock_init(&dev_priv->rps.lock);1500 spin_lock_init(&dev_priv->rps.lock);
1501 spin_lock_init(&dev_priv->gt_lock);
1501 spin_lock_init(&dev_priv->backlight.lock);1502 spin_lock_init(&dev_priv->backlight.lock);
1502 mutex_init(&dev_priv->dpio_lock);1503 mutex_init(&dev_priv->dpio_lock);
1503 mutex_init(&dev_priv->rps.hw_lock);1504 mutex_init(&dev_priv->rps.hw_lock);
drivers/gpu/drm/i915/intel_pm.c+0−2
@@ -5497,8 +5497,6 @@ void intel_gt_init(struct drm_device *dev) · 5496 unmodified lines
5497{5497{
5498 struct drm_i915_private *dev_priv = dev->dev_private;5498 struct drm_i915_private *dev_priv = dev->dev_private;
5499 5499
5500 spin_lock_init(&dev_priv->gt_lock);
5501
5502 if (IS_VALLEYVIEW(dev)) {5500 if (IS_VALLEYVIEW(dev)) {
5503 dev_priv->gt.force_wake_get = vlv_force_wake_get;5501 dev_priv->gt.force_wake_get = vlv_force_wake_get;
5504 dev_priv->gt.force_wake_put = vlv_force_wake_put;5502 dev_priv->gt.force_wake_put = vlv_force_wake_put;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t