Patch "drm/amdgpu: fix num_rbs exposed to userspace (v2)" has been added to the 4.6-stable tree

[<gregkh@linuxfoundation.org>]

This is a note to let you know that I've just added the patch titled

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

to the 4.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-amdgpu-fix-num_rbs-exposed-to-userspace-v2.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 0b10029d826ed8c18a5f9d2f4abfa415d15cd1d3 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 17 Jun 2016 10:17:17 -0400
Subject: drm/amdgpu: fix num_rbs exposed to userspace (v2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Alex Deucher <alexander.deucher@amd.com>

commit 0b10029d826ed8c18a5f9d2f4abfa415d15cd1d3 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -448,7 +448,8 @@ static int amdgpu_info_ioctl(struct drm_
 			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;


Patches currently in stable-queue which might be from alexander.deucher@amd.com are

queue-4.6/drm-radeon-fix-asic-initialization-for-virtualized-environments.patch
queue-4.6/drm-amd-powerplay-fix-logic-error.patch
queue-4.6/drm-amdgpu-gfx7-fix-broken-condition-check.patch
queue-4.6/drm-amdgpu-initialize-amdgpu_cgs_acpi_eval_object-result-value.patch
queue-4.6/drm-amd-powerplay-fix-bug-that-function-parameter-was-incorect.patch
queue-4.6/drm-dp-mst-always-clear-proposed-vcpi-table-for-port.patch
queue-4.6/drm-amd-powerplay-need-to-notify-system-bios-pcie-device-ready.patch
queue-4.6/drm-amd-powerplay-incorrectly-use-of-the-function-return-value.patch
queue-4.6/drm-amdgpu-fix-num_rbs-exposed-to-userspace-v2.patch
queue-4.6/drm-amd-powerplay-fix-incorrect-voltage-table-value-for-tonga.patch