]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Partial revert of atomic watermark series
authorMatt Roper <matthew.d.roper@intel.com>
Thu, 8 Oct 2015 22:28:25 +0000 (15:28 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 9 Oct 2015 08:40:16 +0000 (10:40 +0200)
commitea775285e2908b0f11b7e2b353a950b4384e17d0
treec456c7c3ee4a2040e80f13088ce1d383fe760aad
parentf7dd07d3ed870d4e703d85ed8abcaff6d3b8e792
drm/i915: Partial revert of atomic watermark series

It's been reported that the atomic watermark series triggers some
regressions on SKL, which we haven't been able to track down yet.  Let's
temporarily revert these patches while we track down the root cause.

This commit squashes the reverts of:
  5ac064f drm/i915: Calculate watermark configuration during atomic check (v2)
  177f95f drm/i915: Don't set plane visible during HW readout if CRTC is off
  b7d1161 drm/i915: Calculate ILK-style watermarks during atomic check (v3)
  17019e1 drm/i915: Calculate pipe watermarks into CRTC state (v3)
  7cace4b drm/i915: Refactor ilk_update_wm (v3)

Reference: http://lists.freedesktop.org/archives/intel-gfx/2015-October/077190.html
Cc: "Zanoni, Paulo R" <paulo.r.zanoni@intel.com>
Cc: "Vetter, Daniel" <daniel.vetter@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c