From patchwork Thu Oct 10 11:51:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meelis Roos X-Patchwork-Id: 3015451 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A4C169F243 for ; Thu, 10 Oct 2013 11:51:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D90A20270 for ; Thu, 10 Oct 2013 11:51:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6ABF220225 for ; Thu, 10 Oct 2013 11:51:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 66098E6922 for ; Thu, 10 Oct 2013 04:51:52 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp1.it.da.ut.ee (smtp1.it.da.ut.ee [193.40.5.66]) by gabe.freedesktop.org (Postfix) with ESMTP id 22745E616B for ; Thu, 10 Oct 2013 04:51:39 -0700 (PDT) Received: from math.ut.ee (math.ut.ee [193.40.36.2]) by smtp1.it.da.ut.ee (Postfix) with ESMTP id 69CA29005D; Thu, 10 Oct 2013 14:51:36 +0300 (EEST) Received: by math.ut.ee (Postfix, from userid 1014) id 3991E427978; Thu, 10 Oct 2013 14:51:36 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by math.ut.ee (Postfix) with ESMTP id 2E12D427976; Thu, 10 Oct 2013 14:51:36 +0300 (EEST) Date: Thu, 10 Oct 2013 14:51:36 +0300 (EEST) From: Meelis Roos To: Dave Airlie , Alex Deucher Subject: [PATCH] only try to find radeon IGP ROM on X86 In-Reply-To: Message-ID: References: <1346950551.30263.196.camel@thor.local> <20120906.141823.13429356729572330.davem@davemloft.net> User-Agent: Alpine 1.00 (SOC 882 2007-12-20) MIME-Version: 1.0 Cc: sparclinux@vger.kernel.org, David Miller , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 To prevent hangs on non-PC machines (e.g. sparc64), probe Radeon ROM from ATI IGP only on X86. Fixes hang in this place and allows PCI radeon detection to move on to next problem. Signed-off-by: Meelis Roos diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c index 061b227..48ef97c 100644 --- a/drivers/gpu/drm/radeon/radeon_bios.c +++ b/drivers/gpu/drm/radeon/radeon_bios.c @@ -49,6 +49,11 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev) resource_size_t vram_base; resource_size_t size = 256 * 1024; /* ??? */ +#ifndef CONFIG_X86 + /* IGP only exists on X86 (32- and 64-bit) */ + return false; +#endif + if (!(rdev->flags & RADEON_IS_IGP)) if (!radeon_card_posted(rdev)) return false;