]> 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)
commit3db52a52c2eb01f8c5dd63edde5dd6dac754c6f0
tree2d7e7d702787d10d6c083815fce81858d14d9e86
parentf0381563827658b1c5bf43fb77b31084fca2e8c8
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 0eff857e85a74103e1e6b5d66a7cc595e0fe7b3c.

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

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

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