diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-05 18:49:40 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-20 06:21:37 -0400 |
commit | 67b1b57182972f3c89c1ff9a58951582cb6bcca7 (patch) | |
tree | e7b2bffefa0cd2ecc45d19fb26f9fcdaa9e11471 /drivers/gpu/drm | |
parent | 0232e927f8b0b37f5c82648f9bc45e55fb245068 (diff) |
drm/i915: Disable the BLT on pre-production SNB hardware
It never quite worked despite the numerous workarounds, yet I still see
people trying to use this hardware and filing bug reports. As we no
longer even try to implement the workarounds, since 6a233c78878
(drm/i915/ringbuffer: kill snb blt workaround), simply disable the ring.
v2: Add a message to inform the user about the limited capabilities of
their pre-production hardware.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 0fdb3d29cbbb..89d62f635ac8 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -3726,6 +3726,22 @@ void i915_gem_init_ppgtt(struct drm_device *dev) | |||
3726 | } | 3726 | } |
3727 | } | 3727 | } |
3728 | 3728 | ||
3729 | static bool | ||
3730 | intel_enable_blt(struct drm_device *dev) | ||
3731 | { | ||
3732 | if (!HAS_BLT(dev)) | ||
3733 | return false; | ||
3734 | |||
3735 | /* The blitter was dysfunctional on early prototypes */ | ||
3736 | if (IS_GEN6(dev) && dev->pdev->revision < 8) { | ||
3737 | DRM_INFO("BLT not supported on this pre-production hardware;" | ||
3738 | " graphics performance will be degraded.\n"); | ||
3739 | return false; | ||
3740 | } | ||
3741 | |||
3742 | return true; | ||
3743 | } | ||
3744 | |||
3729 | int | 3745 | int |
3730 | i915_gem_init_hw(struct drm_device *dev) | 3746 | i915_gem_init_hw(struct drm_device *dev) |
3731 | { | 3747 | { |
@@ -3749,7 +3765,7 @@ i915_gem_init_hw(struct drm_device *dev) | |||
3749 | goto cleanup_render_ring; | 3765 | goto cleanup_render_ring; |
3750 | } | 3766 | } |
3751 | 3767 | ||
3752 | if (HAS_BLT(dev)) { | 3768 | if (intel_enable_blt(dev)) { |
3753 | ret = intel_init_blt_ring_buffer(dev); | 3769 | ret = intel_init_blt_ring_buffer(dev); |
3754 | if (ret) | 3770 | if (ret) |
3755 | goto cleanup_bsd_ring; | 3771 | goto cleanup_bsd_ring; |