]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl
authorMarc Herbert <marc.herbert@intel.com>
Wed, 29 Jul 2015 19:21:22 +0000 (12:21 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 5 Aug 2015 08:17:22 +0000 (10:17 +0200)
commit0b9e9de1b4c2bbc3eb66fbb9b520ac2b14dbe182
tree696ac35b5802a07f8e66534d362742b27a2f71f7
parent0b882be481c00b592e9b10b01a8318b78e58b8f2
drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl

With this simple git diff command one can see that skl_init_workarounds()
got two copies of WaBarrierPerformanceFixDisable:skl:

 git diff -U21 142250870ff1^1 142250870ff1 drivers/gpu/drm/i915/intel_ringbuffer.c

This happened when the backmerge of drm-intel-fixes-2015-07-15
Merged the same fix on both sides. Same fix but not identical enough for
git: with a different surrounding context; hence the code duplication.

This commit merely reverts the output of the git command above
 = the duplication introduced in the backmerge.

(This duplication was found while running git sanity checks on a
_linearized_ i915 forklift for ChromeOS.)

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_ringbuffer.c