diff options
| author | Bob Gleitsmann <rjgleits@bellsouth.net> | 2009-12-20 22:52:09 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-22 19:08:08 -0500 |
| commit | e2108eb1f66d77b4af77caf282cab1d47e3f4831 (patch) | |
| tree | 0685a210b76856d6a1787172b8f3a6822e872863 | |
| parent | 7a73ba7469cbea631050094fd14f73acebb97cf9 (diff) | |
drm/mm: fix logic for selection of best fit block
This is from bug 25728.
[airlied: I'm just forwarding the patch for review, Thomas, ickle?]
Acked-by: Jerome Glisse <jglisse@redhat.com>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_mm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index d7d7eac3ddd2..cdec32977129 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c | |||
| @@ -358,7 +358,7 @@ struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm, | |||
| 358 | if (entry->size >= size + wasted) { | 358 | if (entry->size >= size + wasted) { |
| 359 | if (!best_match) | 359 | if (!best_match) |
| 360 | return entry; | 360 | return entry; |
| 361 | if (size < best_size) { | 361 | if (entry->size < best_size) { |
| 362 | best = entry; | 362 | best = entry; |
| 363 | best_size = entry->size; | 363 | best_size = entry->size; |
| 364 | } | 364 | } |
| @@ -408,7 +408,7 @@ struct drm_mm_node *drm_mm_search_free_in_range(const struct drm_mm *mm, | |||
| 408 | if (entry->size >= size + wasted) { | 408 | if (entry->size >= size + wasted) { |
| 409 | if (!best_match) | 409 | if (!best_match) |
| 410 | return entry; | 410 | return entry; |
| 411 | if (size < best_size) { | 411 | if (entry->size < best_size) { |
| 412 | best = entry; | 412 | best = entry; |
| 413 | best_size = entry->size; | 413 | best_size = entry->size; |
| 414 | } | 414 | } |