diff options
| author | Daniel Vetter | 2012-08-08 23:35:35 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-08-09 21:52:22 +0200 |
| commit | c6a828d3269a5d0b9adda1438cf8d7cb2007ca71 (patch) | |
| tree | 461339ff364393d241388e597a04fe07c911b7b6 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/i915: use mutex_lock_interruptible for debugfs files (diff) | |
| download | kernel-qcow2-linux-c6a828d3269a5d0b9adda1438cf8d7cb2007ca71.tar.gz kernel-qcow2-linux-c6a828d3269a5d0b9adda1438cf8d7cb2007ca71.tar.xz kernel-qcow2-linux-c6a828d3269a5d0b9adda1438cf8d7cb2007ca71.zip | |
drm/i915: move all rps state into dev_priv->rps
This way it's easier so see what belongs together, and what is used
by the ilk ips code. Also add some comments that explain the locking.
Note that (cur|min|max)_delay need to be duplicated, because
they're also used by the ips code.
v2: Missed one place that the dev_priv->ips change caught ...
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index a7a213cf06fb..0a1b64f8d442 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1605,7 +1605,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) spin_lock_init(&dev_priv->irq_lock); spin_lock_init(&dev_priv->error_lock); - spin_lock_init(&dev_priv->rps_lock); + spin_lock_init(&dev_priv->rps.lock); if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) dev_priv->num_pipe = 3; |