]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: revert a few more watermark commits
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Fri, 9 Oct 2015 21:22:43 +0000 (18:22 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 13 Oct 2015 11:59:55 +0000 (13:59 +0200)
commite56be7122ffb35a2dcbb8b75c1f638cab421fd17
tree2d7e7d702787d10d6c083815fce81858d14d9e86
parentc65e67f6302703e81035c645d8b973b6699a4521
drm/i915: revert a few more watermark commits

This is a squash of the following commits:

Revert "drm/i915: Drop intel_update_sprite_watermarks"
This reverts commit c762c937c137096516b5507959ae267e787f0b7b.

Revert "drm/i915/ivb: Move WaCxSRDisabledForSpriteScaling w/a to atomic check"
This reverts commit 39498bb0ad9e1e3270f8013184bfb16ae7666aef.

Revert "drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v3)"
This reverts commit 32b0e358ea4b5e2d1bd0ccbb8bc85d5eb9ca1b5d.

With these reverts, SKL finally stops failing every single FBC test
with FIFO underrun error messages. After some brief testing, it also
seems that this commit prevents the machine from completely freezing
when we run igt/kms_fbc_crc (see fd.o #92355).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92355
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_atomic.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_sprite.c