]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915/bdw: remove erroneous chv specific workarounds from bdw code
authorTom O'Rourke <Tom.O'Rourke@intel.com>
Tue, 10 Jun 2014 23:26:34 +0000 (16:26 -0700)
committerJani Nikula <jani.nikula@intel.com>
Fri, 13 Jun 2014 08:33:16 +0000 (11:33 +0300)
commit2c04d3c7405e0b07d08257bac89375356658f1fb
tree703157ed670438a8a5860d1efcb828e29260db7f
parentfe6a6768204e11259df815af55d1397c1422ffbd
drm/i915/bdw: remove erroneous chv specific workarounds from bdw code

Correct a merge mishap in

commit c016eef65c89b6d24bdf943ed7cb73d42fe666b4
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Wed Apr 9 13:28:41 2014 +0300

    drm/i915/chv: Add a bunch of pre production workarounds

Remove the the chv specific workarounds from bdw code, specifically
gen8_enable_rps().

Signed-off-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[Jani: extract hunk #1 for 3.16 from Tom's patch, clarify commit message]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

All, I intend to push this to drm-intel-fixes, any objections?

Jani.
drivers/gpu/drm/i915/intel_pm.c