From: Dave Airlie <airlied@redhat.com>
Date: Tue, 16 Sep 2014 06:02:09 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-2014-09-05' of git://anongit.freedesktop.org/drm-intel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=40d201af0b9e6196a210b97d3b2493b1156564f6;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'drm-intel-next-2014-09-05' of git://anongit.freedesktop.org/drm-intel into drm-next

- final bits (again) for the rotation support (Sonika Jindal)
- support bl_power in the intel backlight (Jani)
- vdd handling improvements from Ville
- i830M fixes from Ville
- piles of prep work all over to make skl enabling just plug in (Damien, Sonika)
- rename DP training defines to reflect latest edp standards, this touches all
  drm drivers supporting DP (Sonika Jindal)
- cache edids during single detect cycle to avoid re-reading it for e.g. audio,
  from Chris
- move w/a for registers which are stored in the hw context to the context init
  code (Arun&Damien)
- edp panel power sequencer fixes, helps chv a lot (Ville)
- piles of other chv fixes all over
- much more paranoid pageflip handling with stall detection and better recovery
  from Chris
- small things all over, as usual

* tag 'drm-intel-next-2014-09-05' of git://anongit.freedesktop.org/drm-intel: (114 commits)
  drm/i915: Update DRIVER_DATE to 20140905
  drm/i915: Decouple the stuck pageflip on modeset
  drm/i915: Check for a stalled page flip after each vblank
  drm/i915: Introduce a for_each_plane() macro
  drm/i915: Rewrite ABS_DIFF() in a safer manner
  drm/i915: Add comments explaining the vdd on/off functions
  drm/i915: Move DP port disable to post_disable for pch platforms
  drm/i915: Enable DP port earlier
  drm/i915: Turn on panel power before doing aux transfers
  drm/i915: Be more careful when picking the initial power sequencer pipe
  drm/i915: Reset power sequencer pipe tracking when disp2d is off
  drm/i915: Track which port is using which pipe's power sequencer
  drm/i915: Fix edp vdd locking
  drm/i915: Reset the HEAD pointer for the ring after writing START
  drm/i915: Fix unsafe vma iteration in i915_drop_caches
  drm/i915: init sprites with univeral plane init function
  drm/i915: Check of !HAS_PCH_SPLIT() in PCH transcoder funcs
  drm/i915: Use HAS_GMCH_DISPLAY un underrun reporting code
  drm/i915: Use IS_BROADWELL() instead of IS_GEN8() in forcewake code
  drm/i915: Don't call gen8_fbc_sw_flush() on chv
  ...
---

40d201af0b9e6196a210b97d3b2493b1156564f6
diff --cc drivers/gpu/drm/i915/intel_display.c
index 32ede71fbe7f,b912107a1392..1386086ec245
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -4178,7 -4253,11 +4274,8 @@@ static void ironlake_crtc_disable(struc
  	if (intel_crtc->config.has_pch_encoder)
  		intel_set_pch_fifo_underrun_reporting(dev, pipe, false);
  
- 	intel_disable_pipe(dev_priv, pipe);
+ 	intel_disable_pipe(intel_crtc);
+ 
 -	if (intel_crtc->config.dp_encoder_is_mst)
 -		intel_ddi_set_vc_payload_alloc(crtc, false);
 -
  	ironlake_pfit_disable(intel_crtc);
  
  	for_each_encoder_on_crtc(dev, crtc, encoder)
@@@ -4241,11 -4319,8 +4337,11 @@@ static void haswell_crtc_disable(struc
  
  	if (intel_crtc->config.has_pch_encoder)
  		intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, false);
- 	intel_disable_pipe(dev_priv, pipe);
+ 	intel_disable_pipe(intel_crtc);
  
 +	if (intel_crtc->config.dp_encoder_is_mst)
 +		intel_ddi_set_vc_payload_alloc(crtc, false);
 +
  	intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);
  
  	ironlake_pfit_disable(intel_crtc);