From patchwork Mon Nov 14 19:59:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Malaterre X-Patchwork-Id: 9428299 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 ACB95602F0 for ; Mon, 14 Nov 2016 19:59:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CBCD28AA4 for ; Mon, 14 Nov 2016 19:59:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FCCB28AA9; Mon, 14 Nov 2016 19:59:41 +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 0431528AA4 for ; Mon, 14 Nov 2016 19:59:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936319AbcKNT7k (ORCPT ); Mon, 14 Nov 2016 14:59:40 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34644 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933969AbcKNT7j (ORCPT ); Mon, 14 Nov 2016 14:59:39 -0500 Received: by mail-wm0-f68.google.com with SMTP id g23so18553394wme.1 for ; Mon, 14 Nov 2016 11:59:38 -0800 (PST) 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=qqK89lLxV2UOqTrNOStYhPf8nEnw10Ts/Baoge2Tr7A=; b=YNd2BQX2etPXQEKQNghAH9bU9EdPJq2rTu9GUZoCS4hzbpWCjqIXycGbXbGP5snBhZ wf4buFKJ6I8cT1w7T2A/fGB8tkyjGanYkGTuetWdthENhTsSnUOhCc/yVEDrcSxEHe0h WvUFT9mH5XPyxtXfmZJsw8FSIRq5ZmFg7Xo+JXh61hNbBbhBsdHAEtlLd+Z7B3DY3Gbo 6pjcUjeLxtAqPleLUeErsPgtvr8Rc+/BAI5Xi/BS4OSmijoGiLtWhOubtXKfckNFP0AC lcqO6PhZjirO9K/G2FMePfd6IQ8VBlO96ZXKupxMQzVYPYGb23/d9RRhOr9qduSiEOer J8UA== 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=qqK89lLxV2UOqTrNOStYhPf8nEnw10Ts/Baoge2Tr7A=; b=TTFcGMeh9LQNMZSxR55FN5kL04lh+z/purpnTg6j9/MUCf70ZdMim+xJ+4TFfKOq54 GoJhHE6WDtNF1R5XFN3OltpB+76gXv97qVZTdDCAA355UUkVOf0x299nHfgPPX2IQR1M uxNzNcqcN0QThz6u6uctHCaaMwlX/IK/OCCvFSUAjuLdp47/74oyRPs/x+5k3oeh5F/b oI/6SgbuIrhM6cL93JKpoNqbm8rWjE607dzSGMkxDIrA+BjQLLR/LCjx+zaX6W06UeBW Tmoeekj9CZgTWfyKcKBw1c75vLAlyESwQea3C1eQdkJah/kCmSgC/Vckd5dE41LCCTZt CYBA== X-Gm-Message-State: ABUngvcfPwaKzapOOhGmEHL3NJxZ3RCnagKjhhsAq7mltRK/RGZ5MZOkuwFN/EN5FgwY2Q== X-Received: by 10.28.218.213 with SMTP id r204mr75060wmg.69.1479153578077; Mon, 14 Nov 2016 11:59:38 -0800 (PST) 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 s204sm140762wmd.1.2016.11.14.11.59.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 11:59:37 -0800 (PST) Received: by maester.malat.net (Postfix, from userid 1000) id 8AF431376035; Mon, 14 Nov 2016 20:59:35 +0100 (CET) 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 v2] Fix loading of module radeonfb on PowerMac Date: Mon, 14 Nov 2016 20:59:17 +0100 Message-Id: <1479153557-20849-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 Link: https://bugzilla.kernel.org/show_bug.cgi?id=119741 Suggested-by: Lennart Sorensen --- drivers/video/fbdev/aty/radeon_base.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c index 218339a..84d634b 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,27 @@ 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)); +#ifndef CONFIG_PPC goto err_release_fb; +#endif } 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)); +#ifndef CONFIG_PPC goto err_release_pci0; +#endif } /* map the regions */ @@ -2511,10 +2535,12 @@ static int radeonfb_pci_register(struct pci_dev *pdev, iounmap(rinfo->mmio_base); err_release_pci2: pci_release_region(pdev, 2); +#ifndef CONFIG_PPC err_release_pci0: pci_release_region(pdev, 0); err_release_fb: framebuffer_release(info); +#endif err_disable: err_out: return ret;