From patchwork Thu Dec 21 22:07:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Malaterre X-Patchwork-Id: 10128495 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 2EA34603B5 for ; Thu, 21 Dec 2017 22:08:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 218C029E0F for ; Thu, 21 Dec 2017 22:08:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 153FA29DFE; Thu, 21 Dec 2017 22:08:24 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 B59BA29DFE for ; Thu, 21 Dec 2017 22:08:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754664AbdLUWIW (ORCPT ); Thu, 21 Dec 2017 17:08:22 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:37526 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753797AbdLUWIV (ORCPT ); Thu, 21 Dec 2017 17:08:21 -0500 Received: by mail-wm0-f68.google.com with SMTP id f140so18447173wmd.2; Thu, 21 Dec 2017 14:08:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uoU5CBMIYAqWSxH09EO9bwz1fV5+JRUd7QNwp/dFBN8=; b=kRYX/z3T8qhh1G5OGQA9EfBu7YIVl82X9QOaBgqmBFINshW7hPV3bio7l6LFyplSFi txYUmwXIe38WYCnlysdfcVePqcmaUaG8roglj0kynsfflYqOAI6Y2IucAO0aclU0+hf5 +T2gDZC5z0oFhl2GmJifNtFkZIBAfLsbJRskUvuy33rcLs7/GnQff1qbnSyL0zGhl8ML 0mDDzgwrckZq0hirCtUTK/wf2eJx3K49tz5l8k0kuNuvtAAh3/6fWUiOfajX6bEsQWve RT4V3ax1pkdIOGyW8w4CTEUXWZkBfFh7R7JbIgv52N1jc2QQya2AA4hWZQynzhv4DC2l Pp4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=uoU5CBMIYAqWSxH09EO9bwz1fV5+JRUd7QNwp/dFBN8=; b=aiEvZMNBVR0jPqIfEezfo25bassHnE3kf0e6wMP2OEKMPdqQGnkzkHaTjXZgEv1ivL DVpL1qwwcQzWHkXMfBNyoU4RpRCYLrbSZHybY0YTM+ZTJcZ/U9d4HmGB3nweByIgxUnH +/jkNhqi8g94ZP8CGOHL8ZucG2/oyJRVNVP4oKD8ACDrQGeDFLcN7xXxZdqDXtF/hDjl jXdabMHmB4YOxq7GZJRPZG7lFq28X3itUj8SXxNoyCAvHeqJo4yVuh6MoVgLCyPlM27A sJVQvqTw0dKBzdnPxRxqY8hPOTtBOotMLHryboSfNFnojfvsY7vQr8GlLTPLeEH0cQpq CvhA== X-Gm-Message-State: AKGB3mIlafOU2pIqS2YvxqigsJXo7j7iCvH5B4uu4sAa9qIga237IrW1 fY+PbOaAxV80cGj8rG/W8a0= X-Google-Smtp-Source: ACJfBoswZCigrKmpoyw5H2FfrRLj9Y3KEocHcoeJEtDlbFNaUU88Shjb1ehImOR6yZIU2MDPKkjjWw== X-Received: by 10.28.221.138 with SMTP id u132mr10413015wmg.113.1513894099742; Thu, 21 Dec 2017 14:08:19 -0800 (PST) Received: from macbookpro.malat.net (bru31-1-78-225-226-121.fbx.proxad.net. [78.225.226.121]) by smtp.gmail.com with ESMTPSA id s70sm8254475wma.37.2017.12.21.14.08.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Dec 2017 14:08:17 -0800 (PST) Received: by macbookpro.malat.net (Postfix, from userid 1000) id B8E2E10C0A0F; Thu, 21 Dec 2017 23:08:15 +0100 (CET) From: Mathieu Malaterre To: Tomi Valkeinen Cc: Lennart Sorensen , Mathieu Malaterre , Benjamin Herrenschmidt , Bartlomiej Zolnierkiewicz , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] Fix loading of module radeonfb on PowerMac Date: Thu, 21 Dec 2017 23:07:56 +0100 Message-Id: <20171221220757.24672-1-malat@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <1479153557-20849-1-git-send-email-malat@debian.org> References: <1479153557-20849-1-git-send-email-malat@debian.org> 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 --- v2: Only fails when CONFIG_PCC is not set v3: Only fails when CONFIG_FB_OF is not set, CONFIG_PCC was too broad. Since the conflicts in region is due to OFfb explicitly refers to it. 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 4d77daeecf99..221879196531 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c @@ -2259,6 +2259,22 @@ static const 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) @@ -2312,19 +2328,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) { +#ifndef CONFIG_FB_OF printk( KERN_ERR "radeonfb (%s): cannot request region 0.\n", pci_name(rinfo->pdev)); goto err_release_fb; +#endif } ret = pci_request_region(pdev, 2, "radeonfb mmio"); if (ret < 0) { +#ifndef CONFIG_FB_OF printk( KERN_ERR "radeonfb (%s): cannot request region 2.\n", pci_name(rinfo->pdev)); goto err_release_pci0; +#endif } /* map the regions */ @@ -2509,10 +2533,12 @@ static int radeonfb_pci_register(struct pci_dev *pdev, iounmap(rinfo->mmio_base); err_release_pci2: pci_release_region(pdev, 2); +#ifndef CONFIG_FB_OF err_release_pci0: pci_release_region(pdev, 0); err_release_fb: framebuffer_release(info); +#endif err_disable: err_out: return ret;