lkml.org 
[lkml]   [2015]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 144/180] drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
    Date
    3.16.7-ckt11 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Imre Deak <imre.deak@intel.com>

    commit b5f1c97f944482e98e6e39208af356630389d1ea upstream.

    Due this typo we don't save/restore the GFX_MAX_REQ_COUNT register across
    suspend/resume, so fix this.

    This was introduced in

    commit ddeea5b0c36f3665446518c609be91f9336ef674
    Author: Imre Deak <imre.deak@intel.com>
    Date: Mon May 5 15:19:56 2014 +0300

    drm/i915: vlv: add runtime PM support

    I noticed this only by reading the code. To my knowledge it shouldn't
    cause any real problems at the moment, since the power well backing this
    register remains on across a runtime s/r. This may change once
    system-wide s0ix functionality is enabled in the kernel.

    v2:
    - resend after a missing git add -u :/

    Signed-off-by: Imre Deak <imre.deak@intel.com>
    Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
    Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
    Signed-off-by: Jani Nikula <jani.nikula@intel.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/i915/i915_drv.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
    index caef2e1774b3..17d375344f46 100644
    --- a/drivers/gpu/drm/i915/i915_drv.c
    +++ b/drivers/gpu/drm/i915/i915_drv.c
    @@ -1018,7 +1018,7 @@ static void vlv_save_gunit_s0ix_state(struct drm_i915_private *dev_priv)
    s->lra_limits[i] = I915_READ(GEN7_LRA_LIMITS_BASE + i * 4);

    s->media_max_req_count = I915_READ(GEN7_MEDIA_MAX_REQ_COUNT);
    - s->gfx_max_req_count = I915_READ(GEN7_MEDIA_MAX_REQ_COUNT);
    + s->gfx_max_req_count = I915_READ(GEN7_GFX_MAX_REQ_COUNT);

    s->render_hwsp = I915_READ(RENDER_HWS_PGA_GEN7);
    s->ecochk = I915_READ(GAM_ECOCHK);
    @@ -1100,7 +1100,7 @@ static void vlv_restore_gunit_s0ix_state(struct drm_i915_private *dev_priv)
    I915_WRITE(GEN7_LRA_LIMITS_BASE + i * 4, s->lra_limits[i]);

    I915_WRITE(GEN7_MEDIA_MAX_REQ_COUNT, s->media_max_req_count);
    - I915_WRITE(GEN7_MEDIA_MAX_REQ_COUNT, s->gfx_max_req_count);
    + I915_WRITE(GEN7_GFX_MAX_REQ_COUNT, s->gfx_max_req_count);

    I915_WRITE(RENDER_HWS_PGA_GEN7, s->render_hwsp);
    I915_WRITE(GAM_ECOCHK, s->ecochk);

    \
     
     \ /
      Last update: 2015-05-07 12:41    [W:3.242 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site