diff options
| author | Ben Widawsky | 2013-07-31 01:27:57 +0200 |
|---|---|---|
| committer | Dave Airlie | 2013-07-31 01:54:09 +0200 |
| commit | e1b4d3036c07ff137955fb1c0197ab62534f46ec (patch) | |
| tree | ebe5ba578b5f2f4612aa5f6369b458593c7fe97c /drivers/gpu/drm/i915/i915_drv.h | |
| parent | Merge branch 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux (diff) | |
| download | kernel-qcow2-linux-e1b4d3036c07ff137955fb1c0197ab62534f46ec.tar.gz kernel-qcow2-linux-e1b4d3036c07ff137955fb1c0197ab62534f46ec.tar.xz kernel-qcow2-linux-e1b4d3036c07ff137955fb1c0197ab62534f46ec.zip | |
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/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
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); 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); |