From: Tom O'Rourke <Tom.O'Rourke@intel.com>
Date: Tue, 10 Jun 2014 23:26:34 +0000 (-0700)
Subject: drm/i915/bdw: remove erroneous chv specific workarounds from bdw code
X-Git-Tag: omap-for-v3.16/fixes-rc4~80^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=223a6f2b975ab35d93270ea1d4fb6e0ac6b27fe6;p=pandora-kernel.git

drm/i915/bdw: remove erroneous chv specific workarounds from bdw code

Correct a merge mishap in

commit e4443e459ccf43f2c139358400365fd6a839d40d
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.
---

Reading git-diff-tree failed