diff options
| author | Jani Nikula | 2016-12-07 11:13:04 +0100 |
|---|---|---|
| committer | Jani Nikula | 2016-12-07 14:18:33 +0100 |
| commit | c0f86832e3fd0d125f22bf26040d24837d0412db (patch) | |
| tree | b99a4370532e31547c0fe207459b99289661652c /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: keep intel device info structs in gen based order (diff) | |
| download | kernel-qcow2-linux-c0f86832e3fd0d125f22bf26040d24837d0412db.tar.gz kernel-qcow2-linux-c0f86832e3fd0d125f22bf26040d24837d0412db.tar.xz kernel-qcow2-linux-c0f86832e3fd0d125f22bf26040d24837d0412db.zip | |
drm/i915: rename BROADWATER and CRESTLINE to I965G and I965GM, respectively
Add more consistency to our naming. Pineview remains the outlier. Keep
using code names for gen5+.
v2: rebased
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1481105584-23033-1-git-send-email-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index ca0bb837a57f..dd1a34ac830f 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3999,7 +3999,7 @@ i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size) goto fail; mask = GFP_HIGHUSER | __GFP_RECLAIMABLE; - if (IS_CRESTLINE(dev_priv) || IS_BROADWATER(dev_priv)) { + if (IS_I965GM(dev_priv) || IS_I965G(dev_priv)) { /* 965gm cannot relocate objects above 4GiB. */ mask &= ~__GFP_HIGHMEM; mask |= __GFP_DMA32; |