[PATCH] drm/amdgpu: fix topaz/tonga gmc assignment in 4.4 stable

[PATCH] drm/amdgpu: fix topaz/tonga gmc assignment in 4.4 stable

[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 <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/amd/amdgpu/vi.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 7628eb4..3e9cbe3 100644
--- 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_version topaz_ip_blocks[] =
 	},
 	{
 		.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_version tonga_ip_blocks[] =
 	},
 	{
 		.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,
-- 
2.5.0

Patch "drm/amdgpu: fix topaz/tonga gmc assignment in 4.4 stable" has been added to the 4.4-stable tree

[gregkh]

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

    drm/amdgpu: fix topaz/tonga gmc assignment in 4.4 stable

to the 4.4-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-topaz-tonga-gmc-assignment-in-4.4-stable.patch
and it can be found in the queue-4.4 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 alexdeucher@gmail.com  Mon Mar  7 15:51:15 2016
From: Alex Deucher <alexdeucher@gmail.com>
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 <alexander.deucher@amd.com>, stable@vger.kernel.org
Message-ID: <1457394045-14840-1-git-send-email-alexander.deucher@amd.com>

From: Alex Deucher <alexdeucher@gmail.com>

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


Patches currently in stable-queue which might be from alexdeucher@gmail.com are

queue-4.4/drm-amdgpu-fix-topaz-tonga-gmc-assignment-in-4.4-stable.patch

Re: [PATCH] drm/amdgpu: fix topaz/tonga gmc assignment in 4.4 stable

[Christian König]

Am 08.03.2016 um 00:40 schrieb 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 <alexander.deucher@amd.com>
> Cc: stable@vger.kernel.org

Well, that's a rather ugly case where the automated back-porting of a 
patch didn't worked.

Fix is Reviewed-by: Christian Kï¿œnig <christian.koenig@amd.com>

Regards,
Christian.

> ---
>   drivers/gpu/drm/amd/amdgpu/vi.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
> index 7628eb4..3e9cbe3 100644
> --- 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_version topaz_ip_blocks[] =
>   	},
>   	{
>   		.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_version tonga_ip_blocks[] =
>   	},
>   	{
>   		.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,