diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-05-19 00:14:40 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2011-05-22 06:27:09 -0400 |
| commit | c289cff10a265ec4afe4396425297ff979a840b5 (patch) | |
| tree | 5e9e5a9d1833c4cbe1178e9e2c6bb61c995dab90 /drivers/gpu/drm/radeon/ni.c | |
| parent | 97bfd0acd32e9639c9136e03955d574655d5cc2b (diff) | |
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 57d3d6c208d8..4e30e9ebd17c 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, | |||
| 417 | num_shader_engines = 1; | 417 | num_shader_engines = 1; |
| 418 | if (num_shader_engines > rdev->config.cayman.max_shader_engines) | 418 | if (num_shader_engines > rdev->config.cayman.max_shader_engines) |
| 419 | num_shader_engines = rdev->config.cayman.max_shader_engines; | 419 | num_shader_engines = rdev->config.cayman.max_shader_engines; |
| 420 | if (num_backends_per_asic > num_shader_engines) | 420 | if (num_backends_per_asic < num_shader_engines) |
| 421 | num_backends_per_asic = num_shader_engines; | 421 | num_backends_per_asic = num_shader_engines; |
| 422 | if (num_backends_per_asic > (rdev->config.cayman.max_backends_per_se * num_shader_engines)) | 422 | if (num_backends_per_asic > (rdev->config.cayman.max_backends_per_se * num_shader_engines)) |
| 423 | num_backends_per_asic = rdev->config.cayman.max_backends_per_se * num_shader_engines; | 423 | num_backends_per_asic = rdev->config.cayman.max_backends_per_se * num_shader_engines; |