diff options
| author | Daniel Vetter | 2013-07-04 13:06:28 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-07-05 23:56:18 +0200 |
| commit | 190d6cd5cd3606dd13a3ca5bf0c23dc520659c15 (patch) | |
| tree | 7a70d5382d09114d95b1eaf085334d8015814162 /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | drm/i915: Explicitly cast pipe -> intel_dpll_id (diff) | |
| download | kernel-qcow2-linux-190d6cd5cd3606dd13a3ca5bf0c23dc520659c15.tar.gz kernel-qcow2-linux-190d6cd5cd3606dd13a3ca5bf0c23dc520659c15.tar.xz kernel-qcow2-linux-190d6cd5cd3606dd13a3ca5bf0c23dc520659c15.zip | |
drm/i915: less magic for stolen preallocated objects w/o gtt offset
A magic -1 is a obscure, especially since it's actually passed as an
unsigned, so depends upon the magic sign extension rules in C. This has
been added in
commit 3727d55e4d85836aa6cb759a965daaef88074150
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed May 8 10:45:14 2013 -0700
drm/i915: allow stolen, pre-allocated objects to avoid GTT allocation v2
Use a proper #define instead. Spotted while reviewing Ben's
drm_mm_create_block changes.
v2: Cast the constant to u32 since otherwise we again have a type
mismatch. Suggested by Chris Wilson.
Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_stolen.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_stolen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 8e023447b7eb..0f18d75fa9f8 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -360,7 +360,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, } /* Some objects just need physical mem from stolen space */ - if (gtt_offset == -1) + if (gtt_offset == I915_GTT_OFFSET_NONE) return obj; /* To simplify the initialisation sequence between KMS and GTT, |