Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

When upstream commit 429c45deae6e57f1bb91bfb05b671063fb0cef60
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=113951



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 610dde5a

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

+6 −6
Original line number Diff line number Diff line
@@ -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,