From: Jesse Barnes Date: Tue, 22 May 2012 16:30:33 +0000 (-0700) Subject: drm/i915: always use RPNSWREQ for turbo change requests X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~14737^2~2^2~3 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=89ba829e38bd500f438bc08af4229204c8ed7f35;p=mirror_ubuntu-artful-kernel.git drm/i915: always use RPNSWREQ for turbo change requests 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. Cc: stable@vger.kernel.org. Tested-by: Joe Bloggsian Signed-off-by: Jesse Barnes Reviewed-by: Eugeni Dodonov Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index bbca4e403b84..00462ef96627 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2438,7 +2438,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 |