diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-05-22 09:30:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-10 00:36:19 +0900 |
| commit | b522dbf26fe08158348773c36dbf88e8147dcc66 (patch) | |
| tree | 8146ab05a4c7f376e7167f507a55c47b8a4cdfe5 /drivers | |
| parent | ee9c8a04666ba15762f736f9030e6e8df02ca1a5 (diff) | |
| download | linux-3.10-b522dbf26fe08158348773c36dbf88e8147dcc66.tar.gz linux-3.10-b522dbf26fe08158348773c36dbf88e8147dcc66.tar.bz2 linux-3.10-b522dbf26fe08158348773c36dbf88e8147dcc66.zip | |
drm/i915: always use RPNSWREQ for turbo change requests
commit 89ba829e38bd500f438bc08af4229204c8ed7f35 upstream.
Media turbo requests can either use RPVSWREQ or RPNSWREQ to indicate
what the interrupt handler should do. Since we only deal with the
latter in our turbo code, make the media engine use that for turbo
requests.
Tested-by: Joe Bloggsian <joebloggsian@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 79a7de1f31b..d4d162f6bab 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8368,7 +8368,7 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv) I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10); I915_WRITE(GEN6_RP_CONTROL, GEN6_RP_MEDIA_TURBO | - GEN6_RP_MEDIA_HW_MODE | + GEN6_RP_MEDIA_HW_NORMAL_MODE | GEN6_RP_MEDIA_IS_GFX | GEN6_RP_ENABLE | GEN6_RP_UP_BUSY_AVG | |