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

Commit 0d20299d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2013-06-24' of... 

Merge tag 'drm-intel-fixes-2013-06-24' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

One remaining regression fix for i915. I've left it in -fixes for more
than a week since it's in tricky code, and it took us a few kernel
releases to notice the regression at all. The fence leak is especially
annoying on gen2/3 and will kill userspace there quickly. For extra
paranoia we've added a WARN in -next to catch this, things seem to be
solid now.

* tag 'drm-intel-fixes-2013-06-24' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: Restore fences after resume and GPU resets
parents acdb37c3 19b2dbde

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -1697,6 +1697,8 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, 
struct dma_buf *i915_gem_prime_export(struct drm_device *dev,

				struct drm_gem_object *gem_obj, int flags);



void i915_gem_restore_fences(struct drm_device *dev);



/* i915_gem_context.c */

void i915_gem_context_init(struct drm_device *dev);

void i915_gem_context_fini(struct drm_device *dev);

drivers/gpu/drm/i915/i915_gem.c

+5 −17
Original line number Diff line number Diff line
@@ -2117,25 +2117,15 @@ static void i915_gem_reset_ring_lists(struct drm_i915_private *dev_priv, 
	}

}



static void i915_gem_reset_fences(struct drm_device *dev)

void i915_gem_restore_fences(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	int i;



	for (i = 0; i < dev_priv->num_fence_regs; i++) {

		struct drm_i915_fence_reg *reg = &dev_priv->fence_regs[i];



		if (reg->obj)

			i915_gem_object_fence_lost(reg->obj);



		i915_gem_write_fence(dev, i, NULL);



		reg->pin_count = 0;

		reg->obj = NULL;

		INIT_LIST_HEAD(&reg->lru_list);

		i915_gem_write_fence(dev, i, reg->obj);

	}



	INIT_LIST_HEAD(&dev_priv->mm.fence_list);

}



void i915_gem_reset(struct drm_device *dev)
@@ -2158,8 +2148,7 @@ void i915_gem_reset(struct drm_device *dev) 
		obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS;

	}



	/* The fence registers are invalidated so clear them out */

	i915_gem_reset_fences(dev);

	i915_gem_restore_fences(dev);

}



/**
@@ -3865,8 +3854,6 @@ i915_gem_idle(struct drm_device *dev) 
	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		i915_gem_evict_everything(dev);



	i915_gem_reset_fences(dev);



	/* Hack!  Don't let anybody do execbuf while we don't control the chip.

	 * We need to replace this with a semaphore, or something.

	 * And not confound mm.suspended!
@@ -4193,7 +4180,8 @@ i915_gem_load(struct drm_device *dev) 
		dev_priv->num_fence_regs = 8;



	/* Initialize fence registers to zero */

	i915_gem_reset_fences(dev);

	INIT_LIST_HEAD(&dev_priv->mm.fence_list);

	i915_gem_restore_fences(dev);



	i915_gem_detect_bit_6_swizzle(dev);

	init_waitqueue_head(&dev_priv->pending_flip_queue);

drivers/gpu/drm/i915/i915_suspend.c

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ int i915_restore_state(struct drm_device *dev) 


	mutex_lock(&dev->struct_mutex);



	i915_gem_restore_fences(dev);

	i915_restore_display(dev);



	if (!drm_core_check_feature(dev, DRIVER_MODESET)) {