Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e895b17 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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 ac5c4e76
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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 63ed2cb2

drivers/gpu/drm/i915/i915_dma.c

+2 −5
Original line number Diff line number Diff line
@@ -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 */

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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;