Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1b4d303 authored by Ben Widawsky's avatar Ben Widawsky Committed by Dave Airlie
Browse files

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 907b28c5
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 181d1b9e
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: default avatarDave Jones <davej@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f34f516a

drivers/gpu/drm/i915/i915_dma.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/intel_pm.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

}