From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-by2on0063.outbound.protection.outlook.com ([207.46.100.63]:60224 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932236AbcCHJKX (ORCPT ); Tue, 8 Mar 2016 04:10:23 -0500 Subject: Re: [PATCH] drm/amdgpu: fix topaz/tonga gmc assignment in 4.4 stable To: Alex Deucher , References: <1457394045-14840-1-git-send-email-alexander.deucher@amd.com> CC: Alex Deucher , From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: <56DE96E7.4000804@amd.com> Date: Tue, 8 Mar 2016 10:09:59 +0100 MIME-Version: 1.0 In-Reply-To: <1457394045-14840-1-git-send-email-alexander.deucher@amd.com> Content-Type: text/plain; charset="iso-8859-15"; format=flowed Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 > 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 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,