Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754240AbcCBAf7 (ORCPT ); Tue, 1 Mar 2016 19:35:59 -0500 Received: from mail333.us4.mandrillapp.com ([205.201.137.77]:43800 "EHLO mail333.us4.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756261AbcCAX5R convert rfc822-to-8bit (ORCPT ); Tue, 1 Mar 2016 18:57:17 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=mandrill; d=linuxfoundation.org; b=Bvly4EYi/+aGuAfBEzysFGh4v4qWKF1hjPClCnl114fbTMbuOCpXkCVK2G4OAQbo3xRrrnE05pf6 M7ZeMjYhTbZIq7mC5iQyBYKP3MQxMszTegwl7ejWl8GfbdzykpzGdqb/hhoQxv+4z1kJyIqnPvNX zItszkBAkHdpvNMNEIk=; From: Greg Kroah-Hartman Subject: [PATCH 4.4 178/342] drm/amdgpu: move gmc7 support out of CIK dependency X-Mailer: git-send-email 2.7.2 To: Cc: Greg Kroah-Hartman , , Ken Wang , =?utf-8?Q?Christian=20K=C3=B6nig?= , Alex Deucher Message-Id: <20160301234533.703982579@linuxfoundation.org> In-Reply-To: <20160301234527.990448862@linuxfoundation.org> References: <20160301234527.990448862@linuxfoundation.org> X-Report-Abuse: Please forward a copy of this message, including all headers, to abuse@mandrill.com X-Report-Abuse: You can also report abuse here: http://mandrillapp.com/contact/abuse?id=30481620.b45e59899b1f45aab43157eca492839e X-Mandrill-User: md_30481620 Date: Tue, 01 Mar 2016 23:54:55 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1163 Lines: 38 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher commit e42d85261680edfc350a6c2a86b7fbb44a85014b upstream. It's used by iceland which is VI. Reviewed-by: Ken Wang Reviewed-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -22,7 +22,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o # add asic specific block -amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o gmc_v7_0.o cik_ih.o kv_smc.o kv_dpm.o \ +amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \ ci_smc.o ci_dpm.o dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o \ amdgpu_amdkfd_gfx_v7.o @@ -31,6 +31,7 @@ amdgpu-y += \ # add GMC block amdgpu-y += \ + gmc_v7_0.o \ gmc_v8_0.o # add IH block