From patchwork Mon Dec 22 11:11:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oded Gabbay X-Patchwork-Id: 5526961 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 74860BEEA8 for ; Mon, 22 Dec 2014 11:11:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A146120160 for ; Mon, 22 Dec 2014 11:11:41 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B77DF200FF for ; Mon, 22 Dec 2014 11:11:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 01F856E2E0; Mon, 22 Dec 2014 03:11:40 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0132.outbound.protection.outlook.com [65.55.169.132]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B77F6E2E0 for ; Mon, 22 Dec 2014 03:11:37 -0800 (PST) Received: from BY1PR0201CA0037.namprd02.prod.outlook.com (25.160.191.175) by BLUPR02MB193.namprd02.prod.outlook.com (10.242.189.148) with Microsoft SMTP Server (TLS) id 15.1.36.22; Mon, 22 Dec 2014 11:11:35 +0000 Received: from BY2FFO11FD027.protection.gbl (2a01:111:f400:7c0c::116) by BY1PR0201CA0037.outlook.office365.com (2a01:111:e400:4814::47) with Microsoft SMTP Server (TLS) id 15.1.49.12 via Frontend Transport; Mon, 22 Dec 2014 11:11:34 +0000 Received: from atltwp01.amd.com (165.204.84.221) by BY2FFO11FD027.mail.protection.outlook.com (10.1.15.216) with Microsoft SMTP Server id 15.1.49.13 via Frontend Transport; Mon, 22 Dec 2014 11:11:33 +0000 X-WSS-ID: 0NGZDR8-07-89W-02 X-M-MSG: Received: from satlvexedge01.amd.com (satlvexedge01.amd.com [10.177.96.28]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp01.amd.com (Axway MailGate 5.3.1) with ESMTPS id 26A25CAE651; Mon, 22 Dec 2014 05:11:32 -0600 (CST) Received: from SATLEXDAG05.amd.com (10.181.40.11) by satlvexedge01.amd.com (10.177.96.28) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 22 Dec 2014 05:11:46 -0600 Received: from STOREXDAG02.amd.com (10.1.13.11) by satlexdag05.amd.com (10.181.40.11) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 22 Dec 2014 06:11:32 -0500 Received: from AMD (10.20.0.84) by storexdag02.amd.com (10.1.13.11) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 22 Dec 2014 06:11:31 -0500 From: Oded Gabbay To: Alexander Deucher Subject: [PATCH] drm/radeon: Try to init amdkfd only if 64 bit kernel Date: Mon, 22 Dec 2014 13:11:13 +0200 Message-ID: <1419246673-7222-1-git-send-email-oded.gabbay@amd.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.20.0.84] X-EOPAttributedMessage: 0 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=Oded.Gabbay@amd.com; X-Forefront-Antispam-Report: CIP:165.204.84.221; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(428002)(199003)(189002)(31966008)(36756003)(68736005)(50226001)(106466001)(86362001)(4396001)(19580395003)(19580405001)(50466002)(48376002)(64706001)(21056001)(47776003)(97736003)(107046002)(77096005)(20776003)(92566001)(33646002)(105586002)(46102003)(101416001)(110136001)(50986999)(229853001)(89996001)(87936001)(120916001)(84676001)(99396003)(62966003)(77156002); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR02MB193; H:atltwp01.amd.com; FPR:; SPF:None; MLV:sfv; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BLUPR02MB193; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:BLUPR02MB193; X-Forefront-PRVS: 0433DB2766 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:BLUPR02MB193; X-OriginatorOrg: amd4.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2014 11:11:33.9442 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96; Ip=[165.204.84.221] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR02MB193 Cc: Dana Elifaz , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Huang Ying , LKP ML X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP amdkfd driver can be compiled only in 64-bit kernel. Therefore, there is no point in trying to initialize amdkfd in 32-bit kernel. In addition, in case of specific configuration of 32-bit kernel, no modules and random kernel base, the symbol_request function doesn't work as expected - It doesn't return NULL if the symbol doesn't exists. That makes the kernel panic. Therefore, the as amdkfd doesn't compile in 32-bit kernel, the best way is just to return false immediately. Signed-off-by: Oded Gabbay Reviewed-by: Alex Deucher --- drivers/gpu/drm/radeon/radeon_kfd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_kfd.c b/drivers/gpu/drm/radeon/radeon_kfd.c index 242fd8b..cb77e5c 100644 --- a/drivers/gpu/drm/radeon/radeon_kfd.c +++ b/drivers/gpu/drm/radeon/radeon_kfd.c @@ -101,6 +101,7 @@ static const struct kgd2kfd_calls *kgd2kfd; bool radeon_kfd_init(void) { +#ifdef CONFIG_X86_64 bool (*kgd2kfd_init_p)(unsigned, const struct kfd2kgd_calls*, const struct kgd2kfd_calls**); @@ -117,6 +118,9 @@ bool radeon_kfd_init(void) } return true; +#else + return false; +#endif } void radeon_kfd_fini(void)