summaryrefslogtreecommitdiff
path: root/radeon
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-12-10 12:38:26 -0500
committerAlex Deucher <alexander.deucher@amd.com>2013-12-24 15:17:06 -0500
commit1543c96e154d6801cf725c3b511d61604a378e03 (patch)
tree022a2f2dc56bdd4cb983f4ed16b98c1517ea7187 /radeon
parent068ea68b3f7ebd5efcfcc2f6ae417651423c8382 (diff)
radeon: avoid possible divide by 0 in surface manager
Some users report hitting a divide by 0 with the tile split in certain apps. Tile_split shouldn't ever be 0 unless the surface structure was not properly initialized. I think there may be some cases where mesa uses an improperly initialized surface struct, but I haven't had time to track it down. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72425 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'radeon')
-rw-r--r--radeon/radeon_surface.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index dcbbfdc5..15127d4d 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -655,7 +655,7 @@ static int eg_surface_init_2d(struct radeon_surface_manager *surf_man,
tileb = tilew * tileh * bpe * surf->nsamples;
/* slices per tile */
slice_pt = 1;
- if (tileb > tile_split) {
+ if (tileb > tile_split && tile_split) {
slice_pt = tileb / tile_split;
}
tileb = tileb / slice_pt;
@@ -1621,7 +1621,7 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man,
tileb = tilew * tileh * bpe * surf->nsamples;
/* slices per tile */
slice_pt = 1;
- if (tileb > tile_split) {
+ if (tileb > tile_split && tile_split) {
slice_pt = tileb / tile_split;
}
tileb = tileb / slice_pt;
@@ -2223,7 +2223,7 @@ static int cik_surface_init_2d(struct radeon_surface_manager *surf_man,
/* slices per tile */
slice_pt = 1;
- if (tileb > tile_split) {
+ if (tileb > tile_split && tile_split) {
slice_pt = tileb / tile_split;
tileb = tileb / slice_pt;
}