diff options
| author | Daniel Vetter | 2013-07-09 14:44:27 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-07-09 16:53:24 +0200 |
| commit | 897f9ed00a906dd3edc69f64d590bba87c45617b (patch) | |
| tree | 670472e74c61de51e0c3e6b42b7e1f122ab5c120 /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | drm/i915: clean up media reset on gm45 (diff) | |
| download | kernel-qcow2-linux-897f9ed00a906dd3edc69f64d590bba87c45617b.tar.gz kernel-qcow2-linux-897f9ed00a906dd3edc69f64d590bba87c45617b.tar.xz kernel-qcow2-linux-897f9ed00a906dd3edc69f64d590bba87c45617b.zip | |
drm/i915: WARN if the bios reserved range is bigger than stolen size
v2: Bail out if we hit the WARN_ON to avoid fallout later on. Spotted
by Chris Wilson.
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index a3ce2cbb9221..76c3b8699168 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -215,6 +215,9 @@ int i915_gem_init_stolen(struct drm_device *dev) if (IS_VALLEYVIEW(dev)) bios_reserved = 1024*1024; /* top 1M on VLV/BYT */ + if (WARN_ON(bios_reserved > dev_priv->gtt.stolen_size)) + return 0; + /* Basic memrange allocator for stolen space */ drm_mm_init(&dev_priv->mm.stolen, 0, dev_priv->gtt.stolen_size - bios_reserved); |