aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c7
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h1
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 9e80d5afd270..d49bd82e24e9 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -751,7 +751,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
751 value = dev->pci_device; 751 value = dev->pci_device;
752 break; 752 break;
753 case I915_PARAM_HAS_GEM: 753 case I915_PARAM_HAS_GEM:
754 value = dev_priv->has_gem; 754 value = 1;
755 break; 755 break;
756 case I915_PARAM_NUM_FENCES_AVAIL: 756 case I915_PARAM_NUM_FENCES_AVAIL:
757 value = dev_priv->num_fence_regs - dev_priv->fence_reg_start; 757 value = dev_priv->num_fence_regs - dev_priv->fence_reg_start;
@@ -764,7 +764,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
764 break; 764 break;
765 case I915_PARAM_HAS_EXECBUF2: 765 case I915_PARAM_HAS_EXECBUF2:
766 /* depends on GEM */ 766 /* depends on GEM */
767 value = dev_priv->has_gem; 767 value = 1;
768 break; 768 break;
769 case I915_PARAM_HAS_BSD: 769 case I915_PARAM_HAS_BSD:
770 value = HAS_BSD(dev); 770 value = HAS_BSD(dev);
@@ -1869,9 +1869,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
1869 goto out_mtrrfree; 1869 goto out_mtrrfree;
1870 } 1870 }
1871 1871
1872 /* enable GEM by default */
1873 dev_priv->has_gem = 1;
1874
1875 intel_irq_init(dev); 1872 intel_irq_init(dev);
1876 1873
1877 /* Try to make sure MCHBAR is enabled before poking at it */ 1874 /* Try to make sure MCHBAR is enabled before poking at it */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 2166da1168c1..cf2c8966d240 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -339,7 +339,6 @@ typedef struct drm_i915_private {
339 339
340 const struct intel_device_info *info; 340 const struct intel_device_info *info;
341 341
342 int has_gem;
343 int relative_constants_mode; 342 int relative_constants_mode;
344 343
345 void __iomem *regs; 344 void __iomem *regs;