From: Dave Airlie <airlied@redhat.com>
Date: Mon, 10 Jun 2013 22:38:56 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-2013-06-01' of git://people.freedesktop.org/~danvet/drm... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e6dfcc5303d5d31cb36e36405acd766c8ed2c923;p=linux-beck.git

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

Daniel writes:
Another round of drm-intel-next for 3.11. Highlights:
- Haswell IPS support (Paulo Zanoni)
- VECS support on Haswell (Ben Widawsky, Xiang Haihao, ...)
- Haswell watermark fixes (Paulo Zanoni)
- "Make the gun bigger again" multithread fence fix from Chris.
- i915_error_state finnally no longer fails with -ENOMEM! Big thanks to
  Mika for tackling this.
- vlv sideband locking fixes from Jani
- Hangcheck prep work for arb_robustness support (Mika&Chris)
- edp vs cpu port confusion clean-up from Imre
- pile of smaller fixes and cleanups all over.

* tag 'drm-intel-next-2013-06-01' of git://people.freedesktop.org/~danvet/drm-intel: (70 commits)
  drm/i915: add i915_ips_status debugfs entry
  drm/i915: add enable_ips module option
  drm/i915: implement IPS feature
  drm/i915: fix up the edp power well check
  drm/i915: add I915_PARAM_HAS_VEBOX to i915_getparam
  drm/i915: add I915_EXEC_VEBOX to i915_gem_do_execbuffer()
  drm/i915: add VEBOX into debugfs
  drm/i915: Enable vebox interrupts
  drm/i915: vebox interrupt get/put
  drm/i915: consolidate interrupt naming scheme
  drm/i915: Convert irq_refounct to struct
  drm/i915: make PM interrupt writes non-destructive
  drm/i915: Add PM regs to pre/post install
  drm/i915: Create an ivybridge_irq_preinstall
  drm/i915: Create a more generic pm handler for hsw+
  drm/i915: add support for 5/6 data buffer partitioning on Haswell
  drm/i915: properly set HSW WM_LP watermarks
  drm/i915: properly set HSW WM_PIPE registers
  drm/i915: fix pch_nop support
  drm/i915: Vebox ringbuffer init
  ...
---

e6dfcc5303d5d31cb36e36405acd766c8ed2c923
diff --cc drivers/gpu/drm/i915/intel_display.c
index a4c9f56afb38,c112466bb769..dff9d4e5b92b
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -8588,14 -8566,13 +8586,8 @@@ static int intel_crtc_set_config(struc
  		goto fail;
  
  	if (config->mode_changed) {
- 		if (set->mode) {
- 			DRM_DEBUG_KMS("attempting to set mode from"
- 					" userspace\n");
- 			drm_mode_debug_printmodeline(set->mode);
- 		}
- 
  		ret = intel_set_mode(set->crtc, set->mode,
  				     set->x, set->y, set->fb);
 -		if (ret) {
 -			DRM_ERROR("failed to set mode on [CRTC:%d], err = %d\n",
 -				  set->crtc->base.id, ret);
 -			goto fail;
 -		}
  	} else if (config->fb_changed) {
  		intel_crtc_wait_for_pending_flips(set->crtc);