aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-05-19 14:14:40 +1000
committerDave Airlie <airlied@gmail.com>2011-05-22 20:27:09 +1000
commitc289cff10a265ec4afe4396425297ff979a840b5 (patch)
tree5e9e5a9d1833c4cbe1178e9e2c6bb61c995dab90
parent97bfd0acd32e9639c9136e03955d574655d5cc2b (diff)
downloadkernel_samsung_aries-c289cff10a265ec4afe4396425297ff979a840b5.zip
kernel_samsung_aries-c289cff10a265ec4afe4396425297ff979a840b5.tar.gz
kernel_samsung_aries-c289cff10a265ec4afe4396425297ff979a840b5.tar.bz2
drm/radeon/kms: fix incorrect comparison in cayman setup code.
This was leading to a bogus value being programmed to the backend routing register. Reviewed-by: Alex Deucher <alexdeucher@gmail.com> cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/ni.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 57d3d6c..4e30e9e 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -417,7 +417,7 @@ static u32 cayman_get_tile_pipe_to_backend_map(struct radeon_device *rdev,
num_shader_engines = 1;
if (num_shader_engines > rdev->config.cayman.max_shader_engines)
num_shader_engines = rdev->config.cayman.max_shader_engines;
- if (num_backends_per_asic > num_shader_engines)
+ if (num_backends_per_asic < num_shader_engines)
num_backends_per_asic = num_shader_engines;
if (num_backends_per_asic > (rdev->config.cayman.max_backends_per_se * num_shader_engines))
num_backends_per_asic = rdev->config.cayman.max_backends_per_se * num_shader_engines;