| Message ID | 1444205866-5355-1-git-send-email-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Oct 07, 2015 at 11:17:44AM +0300, Jani Nikula wrote: > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_gem.c | 18 +----------------- > 1 file changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 52642aff1dab..1e67484fd5dc 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -4558,22 +4558,6 @@ void i915_gem_init_swizzling(struct drm_device *dev) > BUG(); > } > > -static bool > -intel_enable_blt(struct drm_device *dev) > -{ > - if (!HAS_BLT(dev)) > - return false; > - > - /* The blitter was dysfunctional on early prototypes */ > - if (IS_GEN6(dev) && dev->pdev->revision < 8) { I'm not actually sure what the revi<->stepping mapping on SNB is. My SNB is a D2 I believe, and it has rev=0x9, so 0x8 is probably D1. I think D2 was the first production stepping, and D1 may have gotten out as samples. So this would perhaps affect D0 and older steppings, which seems fine to me. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > - DRM_INFO("BLT not supported on this pre-production hardware;" > - " graphics performance will be degraded.\n"); > - return false; > - } > - > - return true; > -} > - > static void init_unused_ring(struct drm_device *dev, u32 base) > { > struct drm_i915_private *dev_priv = dev->dev_private; > @@ -4616,7 +4600,7 @@ int i915_gem_init_rings(struct drm_device *dev) > goto cleanup_render_ring; > } > > - if (intel_enable_blt(dev)) { > + if (HAS_BLT(dev)) { > ret = intel_init_blt_ring_buffer(dev); > if (ret) > goto cleanup_bsd_ring; > -- > 2.1.4
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 52642aff1dab..1e67484fd5dc 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4558,22 +4558,6 @@ void i915_gem_init_swizzling(struct drm_device *dev) BUG(); } -static bool -intel_enable_blt(struct drm_device *dev) -{ - if (!HAS_BLT(dev)) - return false; - - /* The blitter was dysfunctional on early prototypes */ - if (IS_GEN6(dev) && dev->pdev->revision < 8) { - DRM_INFO("BLT not supported on this pre-production hardware;" - " graphics performance will be degraded.\n"); - return false; - } - - return true; -} - static void init_unused_ring(struct drm_device *dev, u32 base) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -4616,7 +4600,7 @@ int i915_gem_init_rings(struct drm_device *dev) goto cleanup_render_ring; } - if (intel_enable_blt(dev)) { + if (HAS_BLT(dev)) { ret = intel_init_blt_ring_buffer(dev); if (ret) goto cleanup_bsd_ring;
Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_gem.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)