Skip to content

Commit

Permalink
drm/i915: rip out dev_priv->has_gem
Browse files Browse the repository at this point in the history
Always true these days. It has been added originally to work
around some issues with the agp layer in 2.6.29:

commit ac5c4e7
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>
  • Loading branch information
Daniel Vetter committed May 3, 2012
1 parent 63ed2cb commit 2e895b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
7 changes: 2 additions & 5 deletions drivers/gpu/drm/i915/i915_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/i915/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@ typedef struct drm_i915_private {

const struct intel_device_info *info;

int has_gem;
int relative_constants_mode;

void __iomem *regs;
Expand Down

0 comments on commit 2e895b1

Please sign in to comment.