lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'drm-intel-fixes' into drm-intel-next

Browse Source
This commit is contained in:
Keith Packard
2011-06-28 10:29:47 -07:00
parent 1e5216e438 f01c22fd59
commit 6ae77e6b6a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/i915/i915_drv.c
View File

@@ -579,6 +579,9 @@ int i915_reset(struct drm_device *dev, u8 flags)
} else switch (INTEL_INFO(dev)->gen) { } else switch (INTEL_INFO(dev)->gen) {
case 6: case 6:
ret = gen6_do_reset(dev, flags); 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; break;
case 5: case 5:
ret = ironlake_do_reset(dev, flags); ret = ironlake_do_reset(dev, flags);

4
drivers/gpu/drm/i915/i915_gem.c
View File

@@ -2080,8 +2080,8 @@ i915_wait_request(struct intel_ring_buffer *ring,
if (!ier) { if (!ier) {
DRM_ERROR("something (likely vbetool) disabled " DRM_ERROR("something (likely vbetool) disabled "
"interrupts, re-enabling\n"); "interrupts, re-enabling\n");
i915_driver_irq_preinstall(ring->dev); ring->dev->driver->irq_preinstall(ring->dev);
i915_driver_irq_postinstall(ring->dev); ring->dev->driver->irq_postinstall(ring->dev);
} }
trace_i915_gem_request_wait_begin(ring, seqno); trace_i915_gem_request_wait_begin(ring, seqno);