diff options
| author | Eugeni Dodonov <eugeni.dodonov@intel.com> | 2012-04-13 17:08:44 -0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-17 12:12:58 +0200 |
| commit | 246bdbeb0f0fb14c4c085b6ed7edbab11afccd33 (patch) | |
| tree | e26cc1828f7c2376e251075081848083d367c681 /drivers/gpu | |
| parent | ef4d084fae9d4719bc52f97e15e41e1602e3bc6e (diff) | |
| download | op-kernel-dev-246bdbeb0f0fb14c4c085b6ed7edbab11afccd33.zip op-kernel-dev-246bdbeb0f0fb14c4c085b6ed7edbab11afccd33.tar.gz | |
drm/i915: share forcewaking code between IVB and HSW
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7506a72..0ef4472 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9312,7 +9312,7 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.force_wake_put = __gen6_gt_force_wake_put; /* IVB configs may use multi-threaded forcewake */ - if (IS_IVYBRIDGE(dev)) { + if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) { u32 ecobus; /* A small trick here - if the bios hasn't configured MT forcewake, |
