lkml.org 
[lkml]   [2013]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 83/99] drm/i915: fix missed hunk after GT access breakage
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ben Widawsky <ben@bwidawsk.net>

    commit e1b4d3036c07ff137955fb1c0197ab62534f46ec upstream.

    Upon some code refactoring, a hunk was missed. This was fixed for
    next, but missed the current trees, and hasn't yet been merged by Dave
    Airlie. It is fixed in:
    commit 907b28c56ea40629aa6595ddfa414ec2fc7da41c
    Author: Chris Wilson <chris@chris-wilson.co.uk>
    Date: Fri Jul 19 20:36:52 2013 +0100

    drm/i915: Colocate all GT access routines in the same file

    It is introduced by:
    commit 181d1b9e31c668259d3798c521672afb8edd355c
    Author: Daniel Vetter <daniel.vetter@ffwll.ch>
    Date: Sun Jul 21 13:16:24 2013 +0200

    drm/i915: fix up gt init sequence fallout

    Reported-by: Dave Jones <davej@redhat.com>
    Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/i915/i915_dma.c | 1 +
    drivers/gpu/drm/i915/i915_drv.h | 1 +
    drivers/gpu/drm/i915/intel_pm.c | 6 ++++++
    3 files changed, 8 insertions(+)

    --- a/drivers/gpu/drm/i915/i915_dma.c
    +++ b/drivers/gpu/drm/i915/i915_dma.c
    @@ -1608,6 +1608,7 @@ int i915_driver_load(struct drm_device *
    intel_detect_pch(dev);

    intel_irq_init(dev);
    + intel_pm_init(dev);
    intel_gt_sanitize(dev);
    intel_gt_init(dev);

    --- a/drivers/gpu/drm/i915/i915_drv.h
    +++ b/drivers/gpu/drm/i915/i915_drv.h
    @@ -1475,6 +1475,7 @@ void i915_hangcheck_elapsed(unsigned lon
    void i915_handle_error(struct drm_device *dev, bool wedged);

    extern void intel_irq_init(struct drm_device *dev);
    +extern void intel_pm_init(struct drm_device *dev);
    extern void intel_hpd_init(struct drm_device *dev);
    extern void intel_gt_init(struct drm_device *dev);
    extern void intel_gt_sanitize(struct drm_device *dev);
    --- a/drivers/gpu/drm/i915/intel_pm.c
    +++ b/drivers/gpu/drm/i915/intel_pm.c
    @@ -4548,6 +4548,12 @@ void intel_gt_init(struct drm_device *de
    dev_priv->gt.force_wake_get = __gen6_gt_force_wake_get;
    dev_priv->gt.force_wake_put = __gen6_gt_force_wake_put;
    }
    +}
    +
    +void intel_pm_init(struct drm_device *dev)
    +{
    + struct drm_i915_private *dev_priv = dev->dev_private;
    +
    INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work,
    intel_gen6_powersave_work);
    }



    \
     
     \ /
      Last update: 2013-08-02 13:01    [W:6.059 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site