drm/i915/chv: Fix "drm/i915/chv: Add a bunch of pre production workarounds"
authorTom O'Rourke <Tom.O'Rourke@intel.com>
Tue, 10 Jun 2014 23:26:34 +0000 (16:26 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 13 Jun 2014 15:45:19 +0000 (17:45 +0200)
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>
drivers/gpu/drm/i915/intel_pm.c

Simple merge