diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2013-07-30 19:27:57 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-07-30 19:54:09 -0400 |
commit | e1b4d3036c07ff137955fb1c0197ab62534f46ec (patch) | |
tree | ebe5ba578b5f2f4612aa5f6369b458593c7fe97c /drivers/gpu | |
parent | f34f516a8daa2517ac19916b88aff60e82d7e13d (diff) |
drm/i915: fix missed hunk after GT access breakage
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>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 66c63808fa35..f4669802a0fb 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) | |||
1594 | intel_detect_pch(dev); | 1594 | intel_detect_pch(dev); |
1595 | 1595 | ||
1596 | intel_irq_init(dev); | 1596 | intel_irq_init(dev); |
1597 | intel_pm_init(dev); | ||
1597 | intel_gt_sanitize(dev); | 1598 | intel_gt_sanitize(dev); |
1598 | intel_gt_init(dev); | 1599 | intel_gt_init(dev); |
1599 | 1600 | ||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d2ee3343c943..1929bffc1c77 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); | |||
1582 | void i915_handle_error(struct drm_device *dev, bool wedged); | 1582 | void i915_handle_error(struct drm_device *dev, bool wedged); |
1583 | 1583 | ||
1584 | extern void intel_irq_init(struct drm_device *dev); | 1584 | extern void intel_irq_init(struct drm_device *dev); |
1585 | extern void intel_pm_init(struct drm_device *dev); | ||
1585 | extern void intel_hpd_init(struct drm_device *dev); | 1586 | extern void intel_hpd_init(struct drm_device *dev); |
1586 | extern void intel_gt_init(struct drm_device *dev); | 1587 | extern void intel_gt_init(struct drm_device *dev); |
1587 | extern void intel_gt_sanitize(struct drm_device *dev); | 1588 | 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 51a2a60f5bfc..f895d1508df8 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) | |||
5536 | dev_priv->gt.force_wake_get = __gen6_gt_force_wake_get; | 5536 | dev_priv->gt.force_wake_get = __gen6_gt_force_wake_get; |
5537 | dev_priv->gt.force_wake_put = __gen6_gt_force_wake_put; | 5537 | dev_priv->gt.force_wake_put = __gen6_gt_force_wake_put; |
5538 | } | 5538 | } |
5539 | } | ||
5540 | |||
5541 | void intel_pm_init(struct drm_device *dev) | ||
5542 | { | ||
5543 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
5544 | |||
5539 | INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, | 5545 | INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, |
5540 | intel_gen6_powersave_work); | 5546 | intel_gen6_powersave_work); |
5541 | } | 5547 | } |