diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2016-12-07 13:13:04 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-12-07 16:18:33 +0300 |
| commit | c0f86832e3fd0d125f22bf26040d24837d0412db (patch) | |
| tree | b99a4370532e31547c0fe207459b99289661652c /drivers/gpu/drm/i915/i915_gem_internal.c | |
| parent | a5ce929bc3ca3057588fadecc2305f17378ce8ab (diff) | |
| download | linux-c0f86832e3fd0d125f22bf26040d24837d0412db.tar.xz | |
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_internal.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_internal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_internal.c b/drivers/gpu/drm/i915/i915_gem_internal.c index 08d26306d40e..2222863e505f 100644 --- a/drivers/gpu/drm/i915/i915_gem_internal.c +++ b/drivers/gpu/drm/i915/i915_gem_internal.c @@ -71,7 +71,7 @@ i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj) #endif gfp = GFP_KERNEL | __GFP_HIGHMEM | __GFP_RECLAIMABLE; - if (IS_CRESTLINE(i915) || IS_BROADWATER(i915)) { + if (IS_I965GM(i915) || IS_I965G(i915)) { /* 965gm cannot relocate objects above 4GiB. */ gfp &= ~__GFP_HIGHMEM; gfp |= __GFP_DMA32; |