mirror of
https://github.com/torvalds/linux.git
synced 2024-12-19 09:32:32 +00:00
Merge branch 'drm-intel-fixes' into drm-intel-next
This commit is contained in:
commit
6ae77e6b6a
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user