lkml.org 
[lkml]   [2012]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 205/262] drm/i915: set the right gen3 flip_done mode also at resume
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

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

    From: Daniel Vetter <daniel.vetter@ffwll.ch>

    commit 974a3b0f9f05b748fe11f1afc31efc32aa5160cb upstream.

    Currently we've only frobbed this bit at irq_init time, but did
    not restore it at resume time. Move it to the gen3 clock gating
    function to fix this.

    Notice while reading through code.

    Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/i915/i915_irq.c | 3 ---
    drivers/gpu/drm/i915/intel_pm.c | 3 +++
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/gpu/drm/i915/i915_irq.c
    +++ b/drivers/gpu/drm/i915/i915_irq.c
    @@ -2626,9 +2626,6 @@ void intel_irq_init(struct drm_device *d
    dev->driver->irq_handler = i8xx_irq_handler;
    dev->driver->irq_uninstall = i8xx_irq_uninstall;
    } else if (INTEL_INFO(dev)->gen == 3) {
    - /* IIR "flip pending" means done if this bit is set */
    - I915_WRITE(ECOSKPD, _MASKED_BIT_DISABLE(ECO_FLIP_DONE));
    -
    dev->driver->irq_preinstall = i915_irq_preinstall;
    dev->driver->irq_postinstall = i915_irq_postinstall;
    dev->driver->irq_uninstall = i915_irq_uninstall;
    --- a/drivers/gpu/drm/i915/intel_pm.c
    +++ b/drivers/gpu/drm/i915/intel_pm.c
    @@ -3528,6 +3528,9 @@ static void gen3_init_clock_gating(struc

    if (IS_PINEVIEW(dev))
    I915_WRITE(ECOSKPD, _MASKED_BIT_ENABLE(ECO_GATING_CX_ONLY));
    +
    + /* IIR "flip pending" means done if this bit is set */
    + I915_WRITE(ECOSKPD, _MASKED_BIT_DISABLE(ECO_FLIP_DONE));
    }

    static void i85x_init_clock_gating(struct drm_device *dev)



    \
     
     \ /
      Last update: 2012-09-28 22:01    [W:2.665 / U:0.604 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site