projects
/
platform
/
kernel
/
linux-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.12-rc2' into drm-intel-next
[platform/kernel/linux-stable.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_stolen.c
diff --git
a/drivers/gpu/drm/i915/i915_gem_stolen.c
b/drivers/gpu/drm/i915/i915_gem_stolen.c
index
b902f2a
..
d284d89
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/
drivers/gpu/drm/i915/i915_gem_stolen.c
@@
-201,6
+201,9
@@
int i915_gem_init_stolen(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private;
int bios_reserved = 0;
+ if (dev_priv->gtt.stolen_size == 0)
+ return 0;
+
dev_priv->mm.stolen_base = i915_stolen_to_physical(dev);
if (dev_priv->mm.stolen_base == 0)
return 0;