On Tue, Jul 30, 2013 at 04:27:57PM -0700, Ben Widawsky wrote:
> 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@xxxxxxxxxxxxxxxxxx>
> 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@xxxxxxxx>
> Date: Sun Jul 21 13:16:24 2013 +0200
>
> drm/i915: fix up gt init sequence fallout
>
> Reported-by: Dave Jones <davej@xxxxxxxxxx>
> Cc: stable <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Ben Widawsky <ben@xxxxxxxxxxxx>
Oops. Thanks a lot for taking care of this while I was goofing of ;-)
-Daniel
> ---
> 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(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 66c6380..f466980 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1594,6 +1594,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
> intel_detect_pch(dev);
>
> intel_irq_init(dev);
> + intel_pm_init(dev);
> intel_gt_sanitize(dev);
> intel_gt_init(dev);
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index d2ee334..1929bff 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1582,6 +1582,7 @@ void i915_hangcheck_elapsed(unsigned long data);
> 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);
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 51a2a60..f895d15 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5536,6 +5536,12 @@ void intel_gt_init(struct drm_device *dev)
> 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);
> }
> --
> 1.8.3.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html