[PATCH] drm/amdgpu: fix num_rbs exposed to userspace (v2)

[PATCH] drm/amdgpu: fix num_rbs exposed to userspace (v2)

[Alex Deucher]

This was accidently broken for harvest cards when the
code was refactored for Polaris support.

v2: multiply by shader engines.  Noticed by Nicolai.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 40a2370..d851ea1 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;
-- 
2.5.5

Re: [amd-gfx] [PATCH] drm/amdgpu: fix num_rbs exposed to userspace (v2)

[Nicolai Hähnle]

LGTM.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

On 17.06.2016 19:52, Alex Deucher wrote:
> This was accidently broken for harvest cards when the
> code was refactored for Polaris support.
>
> v2: multiply by shader engines.  Noticed by Nicolai.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: stable@vger.kernel.org
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index 40a2370..d851ea1 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;
>