diff options
| author |   Marc Herbert <marc.herbert@intel.com> | 2015-07-29 12:21:22 -0700 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-08-05 10:17:22 +0200 |
| commit | 0667405b6061be2949d841f05647e550d48c2765 (patch) | |
| tree | 696ac35b5802a07f8e66534d362742b27a2f71f7 /tools/perf/scripts/python | |
| parent | drm/i915: VLV/CHV PSR: Increase wait delay time before active PSR. (diff) | |
| download | linux-dev-0667405b6061be2949d841f05647e550d48c2765.tar.xz linux-dev-0667405b6061be2949d841f05647e550d48c2765.zip | |
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 ca6e4405779e^1 ca6e4405779e 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>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions