Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae77e6b authored by Keith Packard's avatar Keith Packard
Browse files

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

parents 1e5216e4 f01c22fd

drivers/gpu/drm/i915/i915_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -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);