From: Greg Kroah-Hartman Date: Tue, 8 Mar 2016 00:02:36 +0000 (-0800) Subject: 4.4-stable patches X-Git-Tag: v3.10.100~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2a50b3ac9d869eb5c00ce834cb85ef2cfbff5be;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: drm-amdgpu-fix-topaz-tonga-gmc-assignment-in-4.4-stable.patch --- diff --git a/queue-4.4/drm-amdgpu-fix-topaz-tonga-gmc-assignment-in-4.4-stable.patch b/queue-4.4/drm-amdgpu-fix-topaz-tonga-gmc-assignment-in-4.4-stable.patch new file mode 100644 index 00000000000..f259c530ab3 --- /dev/null +++ b/queue-4.4/drm-amdgpu-fix-topaz-tonga-gmc-assignment-in-4.4-stable.patch @@ -0,0 +1,54 @@ +From alexdeucher@gmail.com Mon Mar 7 15:51:15 2016 +From: Alex Deucher +Date: Mon, 7 Mar 2016 18:40:45 -0500 +Subject: drm/amdgpu: fix topaz/tonga gmc assignment in 4.4 stable +To: gregkh@linuxfoundation.org +Cc: christian.koenig@amd.com, Alex Deucher , stable@vger.kernel.org +Message-ID: <1457394045-14840-1-git-send-email-alexander.deucher@amd.com> + +From: Alex Deucher + +When upstream commit 429c45deae6e57f1bb91bfb05b671063fb0cef60 +was applied to 4.4 as d60703ca942e8d044d61360bc9792fcab54b95d0 +it applied incorrectly to the tonga_ip_blocks array rather than +the topaz_ip_blocks array. Fix that up here. + +Bug: +https://bugzilla.kernel.org/show_bug.cgi?id=113951 + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/vi.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/vi.c ++++ b/drivers/gpu/drm/amd/amdgpu/vi.c +@@ -1082,10 +1082,10 @@ static const struct amdgpu_ip_block_vers + }, + { + .type = AMD_IP_BLOCK_TYPE_GMC, +- .major = 8, +- .minor = 0, ++ .major = 7, ++ .minor = 4, + .rev = 0, +- .funcs = &gmc_v8_0_ip_funcs, ++ .funcs = &gmc_v7_0_ip_funcs, + }, + { + .type = AMD_IP_BLOCK_TYPE_IH, +@@ -1129,10 +1129,10 @@ static const struct amdgpu_ip_block_vers + }, + { + .type = AMD_IP_BLOCK_TYPE_GMC, +- .major = 7, +- .minor = 4, ++ .major = 8, ++ .minor = 0, + .rev = 0, +- .funcs = &gmc_v7_0_ip_funcs, ++ .funcs = &gmc_v8_0_ip_funcs, + }, + { + .type = AMD_IP_BLOCK_TYPE_IH, diff --git a/queue-4.4/series b/queue-4.4/series index 9be8c9afe46..e2b42bcaa81 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -71,3 +71,4 @@ block-get-the-1st-and-last-bvec-via-helpers.patch drm-i915-more-virtual-south-bridge-detection.patch drm-i915-refine-qemu-south-bridge-detection.patch modules-fix-longstanding-proc-kallsyms-vs-module-insertion-race.patch +drm-amdgpu-fix-topaz-tonga-gmc-assignment-in-4.4-stable.patch