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

Commit 25945b66 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2013-12-11' of... 

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

Just a bunch of regression fixes plus a few patches for long-standing
issues in gem corner-cases that we've hunted down in the past weeks. Since
apparently people hit those in the wild (and we also have nice igts for
them) I've opted for -fixes and cc: stable.

There's 1-2 things oustanding on top of this where I'm still waiting on
confirmation from testing, but nothing really scary.

* tag 'drm-intel-fixes-2013-12-11' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: don't update the dri1 breadcrumb with modesetting
  drm/i915: Repeat eviction search after idling the GPU
  drm/i915: Fix use-after-free in do_switch
  drm/i915: fix pm init ordering
  drm/i915: Hold mutex across i915_gem_release
  drm/i915: Skip clock checks on BDW
  drm/i915: Do not clobber config status after a forced restore of hw state
  drm/i915: Take modeset locks around intel_modeset_setup_hw_state()
parents 62a3a126 6c719fac

drivers/gpu/drm/i915/i915_dma.c

+11 −9
Original line number Diff line number Diff line
@@ -83,6 +83,14 @@ void i915_update_dri1_breadcrumb(struct drm_device *dev) 
	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_master_private *master_priv;



	/*

	 * The dri breadcrumb update races against the drm master disappearing.

	 * Instead of trying to fix this (this is by far not the only ums issue)

	 * just don't do the update in kms mode.

	 */

	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return;



	if (dev->primary->master) {

		master_priv = dev->primary->master->driver_priv;

		if (master_priv->sarea_priv)
@@ -1490,16 +1498,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	spin_lock_init(&dev_priv->uncore.lock);

	spin_lock_init(&dev_priv->mm.object_stat_lock);

	mutex_init(&dev_priv->dpio_lock);

	mutex_init(&dev_priv->rps.hw_lock);

	mutex_init(&dev_priv->modeset_restore_lock);



	mutex_init(&dev_priv->pc8.lock);

	dev_priv->pc8.requirements_met = false;

	dev_priv->pc8.gpu_idle = false;

	dev_priv->pc8.irqs_disabled = false;

	dev_priv->pc8.enabled = false;

	dev_priv->pc8.disable_count = 2; /* requirements_met + gpu_idle */

	INIT_DELAYED_WORK(&dev_priv->pc8.enable_work, hsw_enable_pc8_work);

	intel_pm_setup(dev);



	intel_display_crc_init(dev);
@@ -1603,7 +1604,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	}



	intel_irq_init(dev);

	intel_pm_init(dev);

	intel_uncore_sanitize(dev);



	/* Try to make sure MCHBAR is enabled before poking at it */
@@ -1848,8 +1848,10 @@ void i915_driver_lastclose(struct drm_device * dev) 


void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)

{

	mutex_lock(&dev->struct_mutex);

	i915_gem_context_close(dev, file_priv);

	i915_gem_release(dev, file_priv);

	mutex_unlock(&dev->struct_mutex);

}



void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)

drivers/gpu/drm/i915/i915_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) 
		intel_modeset_init_hw(dev);



		drm_modeset_lock_all(dev);

		drm_mode_config_reset(dev);

		intel_modeset_setup_hw_state(dev, true);

		drm_modeset_unlock_all(dev);

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -1906,9 +1906,7 @@ void i915_queue_hangcheck(struct drm_device *dev); 
void i915_handle_error(struct drm_device *dev, bool wedged);



extern void intel_irq_init(struct drm_device *dev);

extern void intel_pm_init(struct drm_device *dev);

extern void intel_hpd_init(struct drm_device *dev);

extern void intel_pm_init(struct drm_device *dev);



extern void intel_uncore_sanitize(struct drm_device *dev);

extern void intel_uncore_early_sanitize(struct drm_device *dev);

drivers/gpu/drm/i915/i915_gem_context.c

+12 −4
Original line number Diff line number Diff line
@@ -347,10 +347,8 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file) 
{

	struct drm_i915_file_private *file_priv = file->driver_priv;



	mutex_lock(&dev->struct_mutex);

	idr_for_each(&file_priv->context_idr, context_idr_cleanup, NULL);

	idr_destroy(&file_priv->context_idr);

	mutex_unlock(&dev->struct_mutex);

}



static struct i915_hw_context *
@@ -423,11 +421,21 @@ static int do_switch(struct i915_hw_context *to) 
	if (ret)

		return ret;



	/* Clear this page out of any CPU caches for coherent swap-in/out. Note

	/*

	 * Pin can switch back to the default context if we end up calling into

	 * evict_everything - as a last ditch gtt defrag effort that also

	 * switches to the default context. Hence we need to reload from here.

	 */

	from = ring->last_context;



	/*

	 * Clear this page out of any CPU caches for coherent swap-in/out. Note

	 * that thanks to write = false in this call and us not setting any gpu

	 * write domains when putting a context object onto the active list

	 * (when switching away from it), this won't block.

	 * XXX: We need a real interface to do this instead of trickery. */

	 *

	 * XXX: We need a real interface to do this instead of trickery.

	 */

	ret = i915_gem_object_set_to_gtt_domain(to->obj, false);

	if (ret) {

		i915_gem_object_unpin(to->obj);

drivers/gpu/drm/i915/i915_gem_evict.c

+11 −3
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ i915_gem_evict_something(struct drm_device *dev, struct i915_address_space *vm, 
	} else

		drm_mm_init_scan(&vm->mm, min_size, alignment, cache_level);



search_again:

	/* First see if there is a large enough contiguous idle region... */

	list_for_each_entry(vma, &vm->inactive_list, mm_list) {

		if (mark_free(vma, &unwind_list))
@@ -115,10 +116,17 @@ none: 
		list_del_init(&vma->exec_list);

	}



	/* We expect the caller to unpin, evict all and try again, or give up.

	 * So calling i915_gem_evict_vm() is unnecessary.

	/* Can we unpin some objects such as idle hw contents,

	 * or pending flips?

	 */

	return -ENOSPC;

	ret = nonblocking ? -ENOSPC : i915_gpu_idle(dev);

	if (ret)

		return ret;



	/* Only idle the GPU and repeat the search once */

	i915_gem_retire_requests(dev);

	nonblocking = true;

	goto search_again;



found:

	/* drm_mm doesn't allow any other other operations while