drm/i915: Fix comparison bug

->stolen->start has type u64 aka unsigned long long; relying on the
difference (effectively cast to int) for sorting is wrong.

It wouldn't be a problem in practice if the values compared are always
within INT_MAX of each other (so that the difference is actually
representable in an int), but 440fd5283a ("drm/mm: Support 4 GiB and
larger ranges") strongly suggests that's not the case.

Note: atm we don't support more than about 1G of stolen, so this is
impossible currenlty.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
[danvet: Add note that this is impossible currently.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Rasmus Villemoes 2015-09-28 23:08:50 +02:00 committed by Daniel Vetter
parent 120f5d2871
commit 2d05fa16fe
1 changed files with 5 additions and 1 deletions

View File

@ -253,7 +253,11 @@ static int obj_rank_by_stolen(void *priv,
struct drm_i915_gem_object *b = struct drm_i915_gem_object *b =
container_of(B, struct drm_i915_gem_object, obj_exec_link); container_of(B, struct drm_i915_gem_object, obj_exec_link);
return a->stolen->start - b->stolen->start; if (a->stolen->start < b->stolen->start)
return -1;
if (a->stolen->start > b->stolen->start)
return 1;
return 0;
} }
static int i915_gem_stolen_list_info(struct seq_file *m, void *data) static int i915_gem_stolen_list_info(struct seq_file *m, void *data)