Commit 3e8d222f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2015-05-29' of... 

Merge tag 'drm-intel-next-fixes-2015-05-29' of git://anongit.freedesktop.org/drm-intel into drm-next

Fixes for 4.2. Nothing too serious (given that it's still pre merge
window). With that it's off for 2 weeks of vacation for me and taking care
of 4.2 fixes for Jani.

* tag 'drm-intel-next-fixes-2015-05-29' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: limit PPGTT size to 2GB in 32-bit platforms
  drm/i915: Another fbdev hack to avoid PSR on fbcon.
  drm/i915: Return the frontbuffer flip to enable intel_crtc_enable_planes.
  drm/i915: disable IPS while getting the sink CRCs
  drm/i915: Disable 12bpc hdmi for now
  drm/i915: Adjust sideband locking a bit for CHV/VLV
  drm/i915: s/dpio_lock/sb_lock/
  drm/i915: Kill intel_flush_primary_plane()
  drm/i915: Throw out WIP CHV power well definitions
  drm/i915: Use the default 600ns LDO programming sequence delay
  drm/i915: Remove unnecessary null check in execlists_context_unqueue
  drm/i915: Use spinlocks for checking when to waitboost
  drm/i915: Fix the confusing comment about the ioctl limits
  Revert "drm/i915: Force clean compilation with -Werror"
parents 1c34d824 501fd70f

drivers/gpu/drm/i915/Kconfig

+0 −8
Original line number Original line Diff line number Diff line
@@ -71,11 +71,3 @@ config DRM_I915_PRELIMINARY_HW_SUPPORT 
	  option changes the default for that module option.

	  option changes the default for that module option.





	  If in doubt, say "N".
 
	  If in doubt, say "N".
 


menu "DRM i915 Debugging"



depends on DRM_I915



source drivers/gpu/drm/i915/Kconfig.debug



endmenu

drivers/gpu/drm/i915/Kconfig.debug

deleted100644 → 0
+0 −5
Original line number Original line Diff line number Diff line 
config DRM_I915_WERROR

	bool "Force GCC to throw an error instead of a warning when compiling"

	default n

	---help---

	  Add -Werror to the build flags for (and only for) i915.ko

drivers/gpu/drm/i915/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -2,8 +2,6 @@ 
# Makefile for the drm device driver.  This driver provides support for the

# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.





subdir-ccflags-$(CONFIG_DRM_I915_WERROR) := -Werror



# Please keep these build lists sorted!

# Please keep these build lists sorted!





# core driver code

# core driver code

drivers/gpu/drm/i915/i915_debugfs.c

+3 −14
Original line number Original line Diff line number Diff line
@@ -2300,15 +2300,6 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) 
	struct drm_device *dev = node->minor->dev;

	struct drm_device *dev = node->minor->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_file *file;

	struct drm_file *file;

	int ret;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	ret = mutex_lock_interruptible(&dev_priv->rps.hw_lock);

	if (ret)

		goto unlock;





	seq_printf(m, "RPS enabled? %d\n", dev_priv->rps.enabled);

	seq_printf(m, "RPS enabled? %d\n", dev_priv->rps.enabled);

	seq_printf(m, "GPU busy? %d\n", dev_priv->mm.busy);

	seq_printf(m, "GPU busy? %d\n", dev_priv->mm.busy);
@@ -2319,6 +2310,7 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) 
		   intel_gpu_freq(dev_priv, dev_priv->rps.min_freq_softlimit),

		   intel_gpu_freq(dev_priv, dev_priv->rps.min_freq_softlimit),

		   intel_gpu_freq(dev_priv, dev_priv->rps.max_freq_softlimit),

		   intel_gpu_freq(dev_priv, dev_priv->rps.max_freq_softlimit),

		   intel_gpu_freq(dev_priv, dev_priv->rps.max_freq));

		   intel_gpu_freq(dev_priv, dev_priv->rps.max_freq));

	spin_lock(&dev_priv->rps.client_lock);

	list_for_each_entry_reverse(file, &dev->filelist, lhead) {

	list_for_each_entry_reverse(file, &dev->filelist, lhead) {

		struct drm_i915_file_private *file_priv = file->driver_priv;

		struct drm_i915_file_private *file_priv = file->driver_priv;

		struct task_struct *task;

		struct task_struct *task;
@@ -2339,12 +2331,9 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) 
		   dev_priv->rps.mmioflips.boosts,

		   dev_priv->rps.mmioflips.boosts,

		   list_empty(&dev_priv->rps.mmioflips.link) ? "" : ", active");

		   list_empty(&dev_priv->rps.mmioflips.link) ? "" : ", active");

	seq_printf(m, "Kernel boosts: %d\n", dev_priv->rps.boosts);

	seq_printf(m, "Kernel boosts: %d\n", dev_priv->rps.boosts);

	spin_unlock(&dev_priv->rps.client_lock);





	mutex_unlock(&dev_priv->rps.hw_lock);

	return 0;

unlock:

	mutex_unlock(&dev->struct_mutex);



	return ret;

}

}





static int i915_llc(struct seq_file *m, void *data)

static int i915_llc(struct seq_file *m, void *data)

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -814,7 +814,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	spin_lock_init(&dev_priv->uncore.lock);

	spin_lock_init(&dev_priv->uncore.lock);

	spin_lock_init(&dev_priv->mm.object_stat_lock);

	spin_lock_init(&dev_priv->mm.object_stat_lock);

	spin_lock_init(&dev_priv->mmio_flip_lock);

	spin_lock_init(&dev_priv->mmio_flip_lock);

	mutex_init(&dev_priv->dpio_lock);

	mutex_init(&dev_priv->sb_lock);

	mutex_init(&dev_priv->modeset_restore_lock);

	mutex_init(&dev_priv->modeset_restore_lock);

	mutex_init(&dev_priv->csr_lock);

	mutex_init(&dev_priv->csr_lock);