diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-01 13:33:49 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-01 13:33:49 -0700 |
| commit | a7f08958d7ca69e26ec85fe49c0be3568a565493 (patch) | |
| tree | 9dab29e11c967211cb8b9bd5c45bee8cd75c723a | |
| parent | bee4d4acf563f91a7796cca53111d91be2532935 (diff) | |
| parent | 2b1ecb7337592a7bf0989efac46a5b52daab769e (diff) | |
| download | blackbird-op-linux-a7f08958d7ca69e26ec85fe49c0be3568a565493.tar.gz blackbird-op-linux-a7f08958d7ca69e26ec85fe49c0be3568a565493.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 2e181614fda7..23d1ae67d279 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1745,7 +1745,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work); I915_WRITE(HWSTAM, 0xeffe); - if (IS_GEN6(dev)) { + if (IS_GEN6(dev) || IS_GEN7(dev)) { /* Workaround stalls observed on Sandy Bridge GPUs by * making the blitter command streamer generate a * write to the Hardware Status Page for |
