git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From ee977685870767221dc763338bb6ed5fd83f65be Mon Sep 17 00:00:00 2001
   2 From: Yong Wang <yong.y.wang@intel.com>
   3 Date: Tue, 6 Jan 2009 15:13:41 +0800
   4 Subject: [PATCH] Revert "drm/i915: GEM on PAE has problems - disable it for now."
   5
   6 This reverts commit ac5c4e76180a74c7f922f6fa71ace0cef45fa433.
   7 ---
   8  drivers/gpu/drm/i915/i915_dma.c |   10 +---------
   9  drivers/gpu/drm/i915/i915_drv.h |    2 --
  10  2 files changed, 1 insertions(+), 11 deletions(-)
  11
  12 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
  13 index afa8a12..553dd4b 100644
  14 --- a/drivers/gpu/drm/i915/i915_dma.c
  15 +++ b/drivers/gpu/drm/i915/i915_dma.c
  16 @@ -717,7 +717,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
  17                 value = dev->pci_device;
  18                 break;
  19         case I915_PARAM_HAS_GEM:
  20 -               value = dev_priv->has_gem;
  21 +               value = 1;
  22                 break;
  23         default:
  24                 DRM_ERROR("Unknown parameter %d\n", param->param);
  25 @@ -830,14 +830,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
  26
  27         dev_priv->regs = ioremap(base, size);
  28
  29 -#ifdef CONFIG_HIGHMEM64G
  30 -       /* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
  31 -       dev_priv->has_gem = 0;
  32 -#else
  33 -       /* enable GEM by default */
  34 -       dev_priv->has_gem = 1;
  35 -#endif
  36 -
  37         i915_gem_load(dev);
  38
  39         /* Init HWS */
  40 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
  41 index b3cc473..adc972c 100644
  42 --- a/drivers/gpu/drm/i915/i915_drv.h
  43 +++ b/drivers/gpu/drm/i915/i915_drv.h
  44 @@ -106,8 +106,6 @@ struct intel_opregion {
  45  typedef struct drm_i915_private {
  46         struct drm_device *dev;
  47
  48 -       int has_gem;
  49 -
  50         void __iomem *regs;
  51         drm_local_map_t *sarea;
  52
  53 --
  54 1.5.5.1
  55