git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
drm/nv50: fix iommu errors caused by device reading from address 0
[safe/jmp/linux-2.6]
/
drivers
/
gpu
/
drm
/
drm_mm.c
diff --git
a/drivers/gpu/drm/drm_mm.c
b/drivers/gpu/drm/drm_mm.c
index
cdec329
..
2ac074c
100644
(file)
--- a/
drivers/gpu/drm/drm_mm.c
+++ b/
drivers/gpu/drm/drm_mm.c
@@
-405,7
+405,8
@@
struct drm_mm_node *drm_mm_search_free_in_range(const struct drm_mm *mm,
wasted += alignment - tmp;
}
- if (entry->size >= size + wasted) {
+ if (entry->size >= size + wasted &&
+ (entry->start + wasted + size) <= end) {
if (!best_match)
return entry;
if (entry->size < best_size) {