• Konstantin Khlebnikov's avatar
    drm/i915: fix long-standing SNB regression in power consumption after resume v2 · 7dcd2677
    Konstantin Khlebnikov authored
    This patch fixes regression in power consumtion of sandy bridge gpu, which
    exists since v3.6 Sometimes after resuming from s2ram gpu starts thinking that
    it's extremely busy. After that it never reaches rc6 state.
    
    Bug exists since kernel v3.6:
    
    commit b4ae3f22
    Author: Jesse Barnes <jbarnes@virtuousgeek.org>
    Date:   Thu Jun 14 11:04:48 2012 -0700
    
        drm/i915: load boot context at driver init time
    
    For some reason RC6 is already enabled at the beginning of resuming process.
    Following initliaztion breaks some internal state and confuses RPS engine.
    This patch disables RC6 at the beginnig of resume and initialization.
    
    I've rearranged initialization sequence, because intel_disable_gt_powersave()
    needs initialized force_wake_get/put and some locks from the dev_priv.
    
    Note: The culprit in the initialization sequence seems to be the write
    to MBCTL added in the above mentioned commit. The first version of
    this patch just held a forcewake reference across the clock gating
    init functions, which seems to have been enought to gather quite a few
    positive test reports. But since that smelled a bit like ad-hoc
    duct-tape v2 now just disables rps/rc6 across the entire hw setup.
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=54089
    References: https://bugzilla.kernel.org/show_bug.cgi?id=58971
    References: https://patchwork.kernel.org/patch/2827634/ (patch v1)
    Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
    Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
    Cc: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    [danvet: Add note about v1 vs. v2 of this patch and use standard
    layout for the commit citation. Also add the tested-bys from v1 and a
    cc: stable.]
    Cc: stable@vger.kernel.org (Note: tiny conflict due to the addition of
    the backlight lock in 3.11)
    Tested-by: Alexander Kaltsas <alexkaltsas@gmail.com> (v1)
    Tested-by: rocko <rockorequin@hotmail.com> (v1)
    Tested-by: JohnMB <johnmbryant@sky.com> (v1)
    Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    7dcd2677
i915_dma.c 51.1 KB