diff options
| author | Daniel Vetter | 2012-04-23 16:50:51 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-05-03 11:18:14 +0200 |
| commit | 2e895b17d7df7af20f7fbdceff249795d2146d01 (patch) | |
| tree | 5b17b5c6d588f700810ab8e96025c1b7b585c209 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/i915: rip out GEM drm feature checks (diff) | |
| download | kernel-qcow2-linux-2e895b17d7df7af20f7fbdceff249795d2146d01.tar.gz kernel-qcow2-linux-2e895b17d7df7af20f7fbdceff249795d2146d01.tar.xz kernel-qcow2-linux-2e895b17d7df7af20f7fbdceff249795d2146d01.zip | |
drm/i915: rip out dev_priv->has_gem
Always true these days. It has been added originally to work
around some issues with the agp layer in 2.6.29:
commit ac5c4e76180a74c7f922f6fa71ace0cef45fa433
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Dec 19 15:38:34 2008 +1000
drm/i915: GEM on PAE has problems - disable it for now.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 7 |
1 files changed, 2 insertions, 5 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, value = dev->pci_device; break; case I915_PARAM_HAS_GEM: - value = dev_priv->has_gem; + value = 1; break; case I915_PARAM_NUM_FENCES_AVAIL: 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, break; case I915_PARAM_HAS_EXECBUF2: /* depends on GEM */ - value = dev_priv->has_gem; + value = 1; break; case I915_PARAM_HAS_BSD: value = HAS_BSD(dev); @@ -1869,9 +1869,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) goto out_mtrrfree; } - /* enable GEM by default */ - dev_priv->has_gem = 1; - intel_irq_init(dev); /* Try to make sure MCHBAR is enabled before poking at it */ |