]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
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>
Wed, 3 Jun 2015 07:26:09 +0000 (10:26 +0300)
commit5b6fd12a88a7233b58c669dc87979da9a69728b1
tree57c1702643bd5e635e98ee79255979888de5c618
parenta2ee48d60eed9cfb6447a4233370aee4ea88108b
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