Commit 53e60909 authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman

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

When upstream commit 429c45de
was applied to 4.4 as d60703ca
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=113951Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 610dde5a
...@@ -1082,10 +1082,10 @@ static const struct amdgpu_ip_block_version topaz_ip_blocks[] = ...@@ -1082,10 +1082,10 @@ static const struct amdgpu_ip_block_version topaz_ip_blocks[] =
}, },
{ {
.type = AMD_IP_BLOCK_TYPE_GMC, .type = AMD_IP_BLOCK_TYPE_GMC,
.major = 8, .major = 7,
.minor = 0, .minor = 4,
.rev = 0, .rev = 0,
.funcs = &gmc_v8_0_ip_funcs, .funcs = &gmc_v7_0_ip_funcs,
}, },
{ {
.type = AMD_IP_BLOCK_TYPE_IH, .type = AMD_IP_BLOCK_TYPE_IH,
...@@ -1129,10 +1129,10 @@ static const struct amdgpu_ip_block_version tonga_ip_blocks[] = ...@@ -1129,10 +1129,10 @@ static const struct amdgpu_ip_block_version tonga_ip_blocks[] =
}, },
{ {
.type = AMD_IP_BLOCK_TYPE_GMC, .type = AMD_IP_BLOCK_TYPE_GMC,
.major = 7, .major = 8,
.minor = 4, .minor = 0,
.rev = 0, .rev = 0,
.funcs = &gmc_v7_0_ip_funcs, .funcs = &gmc_v8_0_ip_funcs,
}, },
{ {
.type = AMD_IP_BLOCK_TYPE_IH, .type = AMD_IP_BLOCK_TYPE_IH,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment