diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-09-28 23:08:50 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-09-30 10:20:35 +0200 |
commit | 2d05fa16fefb9922e021e0b7db4a0c515558f103 (patch) | |
tree | e6ca8cccefe91a79f32617e167bca140c74da3b3 | |
parent | 120f5d28714b5c401179a1fd6010c86b13d912ff (diff) | |
download | linux-stable-2d05fa16fefb9922e021e0b7db4a0c515558f103.tar.gz linux-stable-2d05fa16fefb9922e021e0b7db4a0c515558f103.tar.bz2 linux-stable-2d05fa16fefb9922e021e0b7db4a0c515558f103.zip |
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 440fd5283a87 ("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>
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index afa79827f1f7..9839831dd6e5 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -253,7 +253,11 @@ static int obj_rank_by_stolen(void *priv, struct drm_i915_gem_object *b = 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) |