summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-06-17 10:17:17 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-06-17 14:25:46 -0400
commit0b10029d826ed8c18a5f9d2f4abfa415d15cd1d3 (patch)
tree024721b93ea3e7e3f29672dbeeed38e9fd2ba66b /drivers
parent041bf0225552044b85ce7ee7981e790d987d6ceb (diff)
downloadlinux-stable-0b10029d826ed8c18a5f9d2f4abfa415d15cd1d3.tar.gz
linux-stable-0b10029d826ed8c18a5f9d2f4abfa415d15cd1d3.tar.bz2
linux-stable-0b10029d826ed8c18a5f9d2f4abfa415d15cd1d3.zip
drm/amdgpu: fix num_rbs exposed to userspace (v2)
This was accidently broken for harvest cards when the code was refactored for Polaris support. v2: multiply by shader engines. Noticed by Nicolai. Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 40a23704a981..d851ea15059f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -447,7 +447,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
dev_info.max_memory_clock = adev->pm.default_mclk * 10;
}
dev_info.enabled_rb_pipes_mask = adev->gfx.config.backend_enable_mask;
- dev_info.num_rb_pipes = adev->gfx.config.num_rbs;
+ dev_info.num_rb_pipes = adev->gfx.config.max_backends_per_se *
+ adev->gfx.config.max_shader_engines;
dev_info.num_hw_gfx_contexts = adev->gfx.config.max_hw_contexts;
dev_info._pad = 0;
dev_info.ids_flags = 0;