From patchwork Sat Oct 8 12:09:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Malaterre X-Patchwork-Id: 9368133 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 438FC6048F for ; Sat, 8 Oct 2016 12:09:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3321029922 for ; Sat, 8 Oct 2016 12:09:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2634029990; Sat, 8 Oct 2016 12:09:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55E5B29922 for ; Sat, 8 Oct 2016 12:09:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757871AbcJHMJY (ORCPT ); Sat, 8 Oct 2016 08:09:24 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34175 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757491AbcJHMJX (ORCPT ); Sat, 8 Oct 2016 08:09:23 -0400 Received: by mail-wm0-f66.google.com with SMTP id b201so6760551wmb.1 for ; Sat, 08 Oct 2016 05:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=v6HawtgOBoUiEh9eNS0QrGmtAk4i+G0vEaNdeS2sCu0=; b=W3JdKv9GJxBtjEh0Y1EMukkxee9NrKCaUYkYDwXs2mfQ7A/1sWGqathurZOEOrLIYR xpCaoa1LqbKvVKGvHYdR6wfuXraFKW3gWUORWsnORQN2nKHTrMft+QEq8bdDEc1ufVEy yPsNStpn+c4tdgQq0qq7nhglRfboa7hGlBptQ1UKO1qdaXilS9OlOCkbuBHKYh5eIsQW uRtUiBZWBL0yjPr/DjmSb8pfyt2WhwbQcFva8j9EDxnvXf7zR8qtFnyym3TF5Cp0EhJp RSERdOl1ndVcMt1j8sIp+tgrZ8xNxLwLDUVSBagyVnfveBnlXzkCNKSj+aHsofNoX+gV 9I8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=v6HawtgOBoUiEh9eNS0QrGmtAk4i+G0vEaNdeS2sCu0=; b=ZcXhToJgWR4MdgvxOL0nEogthCFCKMo8LhQoCkOoXEV2n2cWjrQHyZ2Jzc/szMKKDV yFkkSo9WFX3Y4mg8f6cSjtQF7tlCgTP4Jm9a8uLjRuOlTPWbdB31al7BrRhAh+Pneqnw iOVEV64fugroGftYVuyAx++3z3+QubRXKCkj9eRKqkDtBSm0FwaCLqkFNw6IXjl30a32 fY2wI4ANkiawyF1sxkORTI6gGtcHKxtJ3VdGu7kjThHcd+dBBIyAOXE+Z/K96MPvIECf xJ5KXEtxvUW4auiRNQUKpTQXDOPuVtYBT3e3kvZzZNRDOfKBA90XqgKp/lYVRh0s+UfI 8U0w== X-Gm-Message-State: AA6/9RkvOm2JJaVAitEw4oIa1OVjc8Bsd8YY1e8V6QKl9jvjLEe9J/UtxrVKF7iqVJgxuA== X-Received: by 10.194.96.211 with SMTP id du19mr17078817wjb.62.1475928562065; Sat, 08 Oct 2016 05:09:22 -0700 (PDT) Received: from maester.malat.net (bru31-1-78-225-226-121.fbx.proxad.net. [78.225.226.121]) by smtp.gmail.com with ESMTPSA id r1sm24692661wjc.43.2016.10.08.05.09.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Oct 2016 05:09:19 -0700 (PDT) Received: by maester.malat.net (Postfix, from userid 1000) id D7C991376035; Sat, 8 Oct 2016 14:09:17 +0200 (CEST) From: Mathieu Malaterre To: linux-fbdev@vger.kernel.org Cc: Lennart Sorensen , Tomi Valkeinen , Jean-Christophe Plagniol-Villard , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, Mathieu Malaterre Subject: [PATCH] Fix loading of module radeonfb on PowerMac Date: Sat, 8 Oct 2016 14:09:00 +0200 Message-Id: <1475928540-19647-1-git-send-email-malat@debian.org> X-Mailer: git-send-email 2.1.4 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When the linux kernel is build with (typical kernel ship with Debian installer): CONFIG_FB_OF=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_FB_RADEON=m The offb driver takes precedence over module radeonfb. It is then impossible to load the module, error reported is: [ 96.551486] radeonfb 0000:00:10.0: enabling device (0006 -> 0007) [ 96.551526] radeonfb 0000:00:10.0: BAR 0: can't reserve [mem 0x98000000-0x9fffffff pref] [ 96.551531] radeonfb (0000:00:10.0): cannot request region 0. [ 96.551545] radeonfb: probe of 0000:00:10.0 failed with error -16 This patch reproduce the behavior of the module radeon, so as to make it possible to load radeonfb when offb is first loaded. It should be noticed that `offb_destroy` is never called which explain the need to skip error detection on the radeon side. Signed-off-by: Mathieu Malaterre Link: https://bugs.debian.org/826629#57 Suggested-by: Lennart Sorensen --- drivers/video/fbdev/aty/radeon_base.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c index 218339a..6f9bacd 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c @@ -2259,6 +2259,22 @@ static struct bin_attribute edid2_attr = { .read = radeon_show_edid2, }; +static int radeon_kick_out_firmware_fb(struct pci_dev *pdev) +{ + struct apertures_struct *ap; + + ap = alloc_apertures(1); + if (!ap) + return -ENOMEM; + + ap->ranges[0].base = pci_resource_start(pdev, 0); + ap->ranges[0].size = pci_resource_len(pdev, 0); + + remove_conflicting_framebuffers(ap, KBUILD_MODNAME, false); + kfree(ap); + + return 0; +} static int radeonfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) @@ -2314,19 +2330,21 @@ static int radeonfb_pci_register(struct pci_dev *pdev, rinfo->fb_base_phys = pci_resource_start (pdev, 0); rinfo->mmio_base_phys = pci_resource_start (pdev, 2); + ret = radeon_kick_out_firmware_fb(pdev); + if (ret) + return ret; + /* request the mem regions */ ret = pci_request_region(pdev, 0, "radeonfb framebuffer"); if (ret < 0) { printk( KERN_ERR "radeonfb (%s): cannot request region 0.\n", pci_name(rinfo->pdev)); - goto err_release_fb; } ret = pci_request_region(pdev, 2, "radeonfb mmio"); if (ret < 0) { printk( KERN_ERR "radeonfb (%s): cannot request region 2.\n", pci_name(rinfo->pdev)); - goto err_release_pci0; } /* map the regions */