diff options
| author | Paulo Zanoni | 2013-08-24 00:51:28 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-09-03 19:17:57 +0200 |
| commit | 1f5d76dbb636c73912c9ff1c90ff46dd2273f098 (patch) | |
| tree | 416dd27dc8244bc2131f021586d7e824e5dee990 /drivers/gpu/drm/i915/intel_sprite.c | |
| parent | x86: add early quirk for reserving Intel graphics stolen memory v5 (diff) | |
| download | kernel-qcow2-linux-1f5d76dbb636c73912c9ff1c90ff46dd2273f098.tar.gz kernel-qcow2-linux-1f5d76dbb636c73912c9ff1c90ff46dd2273f098.tar.xz kernel-qcow2-linux-1f5d76dbb636c73912c9ff1c90ff46dd2273f098.zip | |
drm/i915: enable trickle feed on Haswell
We shouldn't disable the trickle feed bits on Haswell. Our
documentation explicitly says the trickle feed bits of PRI_CTL and
CUR_CTL should not be programmed to 1, and the hardware engineer also
asked us to not program the SPR_CTL field to 1. Leaving the bits as 1
could cause underflows.
Reported-by: Arthur Runyan <arthur.j.runyan@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 78b621cdd108..ad6ec4b39005 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -260,8 +260,11 @@ ivb_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, if (obj->tiling_mode != I915_TILING_NONE) sprctl |= SPRITE_TILED; - /* must disable */ - sprctl |= SPRITE_TRICKLE_FEED_DISABLE; + if (IS_HASWELL(dev)) + sprctl &= ~SPRITE_TRICKLE_FEED_DISABLE; + else + sprctl |= SPRITE_TRICKLE_FEED_DISABLE; + sprctl |= SPRITE_ENABLE; if (IS_HASWELL(dev)) |