diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-28 10:29:47 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-28 10:29:47 -0700 |
| commit | 6ae77e6b6ae20c280df8ca78e9c9d9a8ccfe7a98 (patch) | |
| tree | 4c956b1d8104610819104652a8dd4f22a6627963 | |
| parent | 1e5216e43846b7758b2a04b3612c475608a4b708 (diff) | |
| parent | f01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3 (diff) | |
| download | linux-3.10-6ae77e6b6ae20c280df8ca78e9c9d9a8ccfe7a98.tar.gz linux-3.10-6ae77e6b6ae20c280df8ca78e9c9d9a8ccfe7a98.tar.bz2 linux-3.10-6ae77e6b6ae20c280df8ca78e9c9d9a8ccfe7a98.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 0defd427059..609358faaa9 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -579,6 +579,9 @@ int i915_reset(struct drm_device *dev, u8 flags) } else switch (INTEL_INFO(dev)->gen) { case 6: ret = gen6_do_reset(dev, flags); + /* If reset with a user forcewake, try to restore */ + if (atomic_read(&dev_priv->forcewake_count)) + __gen6_gt_force_wake_get(dev_priv); break; case 5: ret = ironlake_do_reset(dev, flags); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6026817372d..71cc8a353a7 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2080,8 +2080,8 @@ i915_wait_request(struct intel_ring_buffer *ring, if (!ier) { DRM_ERROR("something (likely vbetool) disabled " "interrupts, re-enabling\n"); - i915_driver_irq_preinstall(ring->dev); - i915_driver_irq_postinstall(ring->dev); + ring->dev->driver->irq_preinstall(ring->dev); + ring->dev->driver->irq_postinstall(ring->dev); } trace_i915_gem_request_wait_begin(ring, seqno); |