Skip to content

Commit

Permalink
drm/i915: Also reinit the BSD and BLT rings after a GPU reset.
Browse files Browse the repository at this point in the history
Signed-off-by: Eric Anholt <[email protected]>
Signed-off-by: Chris Wilson <[email protected]>
  • Loading branch information
anholt authored and ickle committed Nov 22, 2010
1 parent df9c204 commit 75a6898
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/gpu/drm/i915/i915_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,14 @@ int i915_reset(struct drm_device *dev, u8 flags)
*/
if (drm_core_check_feature(dev, DRIVER_MODESET) ||
!dev_priv->mm.suspended) {
struct intel_ring_buffer *ring = &dev_priv->render_ring;
dev_priv->mm.suspended = 0;
ring->init(ring);

dev_priv->render_ring.init(&dev_priv->render_ring);
if (HAS_BSD(dev))
dev_priv->bsd_ring.init(&dev_priv->bsd_ring);
if (HAS_BLT(dev))
dev_priv->blt_ring.init(&dev_priv->blt_ring);

mutex_unlock(&dev->struct_mutex);
drm_irq_uninstall(dev);
drm_irq_install(dev);
Expand Down

0 comments on commit 75a6898

Please sign in to comment.