drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 2 Jun 2015 12:37:35 +0000 (15:37 +0300)
committerJani Nikula <jani.nikula@intel.com>
Thu, 4 Jun 2015 11:15:45 +0000 (14:15 +0300)
commit4f47c99a9be7e9b90a7f3c2c4599ea6b7c2ec49d
tree3581822859273ff548b6f0ff70f397bba57e1ef5
parent77b64555f8ddf28d99b4cc19ef4a56b6df39cd81
drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code

 commit 65ca7514e21adbee25b8175fc909759c735d00ff
 Author: Damien Lespiau <damien.lespiau@intel.com>
 Date:   Mon Feb 9 19:33:22 2015 +0000

    drm/i915/skl: Implement WaBarrierPerformanceFixDisable

got misapplied and the code landed in chv_init_workarounds() instead of
the intended skl_init_workarounds(). Move it over to the right place.

Cc: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_ringbuffer.c