Skip to content

Commit 53e6090

Browse files
agd5fgregkh
authored andcommitted
drm/amdgpu: fix topaz/tonga gmc assignment in 4.4 stable
When upstream commit 429c45deae6e57f1bb91bfb05b671063fb0cef60 was applied to 4.4 as d60703c 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>
1 parent 610dde5 commit 53e6090

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

  • drivers/gpu/drm/amd/amdgpu

drivers/gpu/drm/amd/amdgpu/vi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,10 +1082,10 @@ static const struct amdgpu_ip_block_version topaz_ip_blocks[] =
10821082
},
10831083
{
10841084
.type = AMD_IP_BLOCK_TYPE_GMC,
1085-
.major = 8,
1086-
.minor = 0,
1085+
.major = 7,
1086+
.minor = 4,
10871087
.rev = 0,
1088-
.funcs = &gmc_v8_0_ip_funcs,
1088+
.funcs = &gmc_v7_0_ip_funcs,
10891089
},
10901090
{
10911091
.type = AMD_IP_BLOCK_TYPE_IH,
@@ -1129,10 +1129,10 @@ static const struct amdgpu_ip_block_version tonga_ip_blocks[] =
11291129
},
11301130
{
11311131
.type = AMD_IP_BLOCK_TYPE_GMC,
1132-
.major = 7,
1133-
.minor = 4,
1132+
.major = 8,
1133+
.minor = 0,
11341134
.rev = 0,
1135-
.funcs = &gmc_v7_0_ip_funcs,
1135+
.funcs = &gmc_v8_0_ip_funcs,
11361136
},
11371137
{
11381138
.type = AMD_IP_BLOCK_TYPE_IH,

0 commit comments

Comments
 (0)