From: Tom O'Rourke <Tom.O'Rourke@intel.com>
Date: Tue, 10 Jun 2014 23:26:34 +0000 (-0700)
Subject: drm/i915/chv: Fix "drm/i915/chv: Add a bunch of pre production workarounds"
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~125^2~63^2~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7405f42c790f123f5301dbd2a9ebb69ccd909f47;p=pandora-kernel.git

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

Correct a merge mishap in commit e4443e459ccf43f2c139358400365fd6a839d40d.

Wa*:chv belongs in cherryview_enable_rps, not 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>
---

Reading git-diff-tree failed