From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Tue, 2 Jun 2015 12:37:35 +0000 (+0300)
Subject: drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code
X-Git-Tag: omap-for-v4.3/fixes-rc1~89^2~36^2~307^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b6fd12a88a7233b58c669dc87979da9a69728b1;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed