From patchwork Tue Feb 13 18:03:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Malaterre X-Patchwork-Id: 10217243 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 99AE6601C2 for ; Tue, 13 Feb 2018 18:03:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89FBC28CCD for ; Tue, 13 Feb 2018 18:03:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E9BE28CD5; Tue, 13 Feb 2018 18:03:43 +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=unavailable 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 2421528CCD for ; Tue, 13 Feb 2018 18:03:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965378AbeBMSD3 (ORCPT ); Tue, 13 Feb 2018 13:03:29 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:32992 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965158AbeBMSD1 (ORCPT ); Tue, 13 Feb 2018 13:03:27 -0500 Received: by mail-wr0-f195.google.com with SMTP id s5so19509775wra.0; Tue, 13 Feb 2018 10:03:27 -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; bh=ovGv34GrcAOVlEgZ7kRH9G7jo0SXwEy4Vw3fohFFurc=; b=VIftLP2Sp7umftNnBpUY7Y6kicYgq0Bwad5+vjfEYzfEOEXSa2bpf6Sawb5MiS8QD1 4Zipsl/wgvUmOhBU+FWB9uVnR6xRjzKzn8yWJbgGoNFDQfFUZj+Dtjq+FG6LmYqZjyy1 WOrhl57+d2rnKllVyLU0fXE1VZFJ1FknvPpVxUn0UBn/xxGCe8jU4Lkxeqkxe6+d9TdO dJf63k8PQTJd2zmXpiW5ztj/PWvVfoMfhJGicvfnHvC7a7mcOEydQHVvGrI+vB4o5K25 vBshf5F/Q7Yv0VVCwF5bm+4bxdbDspMdIfzKJQgYpTWtijdOXM0OuNiIgiBNVRViW6b7 ZD0g== 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; bh=ovGv34GrcAOVlEgZ7kRH9G7jo0SXwEy4Vw3fohFFurc=; b=Px1YdO7opMdmi+YDfNUbeTyN9vt3AmjHzgelKJ5ipO0a5Q+isgudhmqSvFgtSo9axM l+H63x1Dkp5IHVkEAkeljsmmeMhf+FqHHlKkXMELGP1zxpH65pOPR5JyP15QK05gxeVN R+ZJjHkeK4jY62vBCPsm451HVh372g6z39rALSMIm/Tux+WwWSO/dHaMohJj8VKjrVNZ rU/klRobuQykungxkxVa89HH6nrUI+Sqb5bYpziWviz1UVx/YouKBnGJDZKgTzTumlBH +6ZDQc1cxhoDv1v/WYaTxsSkp3E4ljO1mtrU32RphQQlfWYAICnQTXMw3eNZ1bA9NwGJ 2GSQ== X-Gm-Message-State: APf1xPBexTvyuynaQGTXQ2YpUROKFGRjT27iyoXeQ8sy8eTSfQbjQEKf TPAEQi5nlGN654yGLGwDbqg= X-Google-Smtp-Source: AH8x224JEMtvJjDrz4rP7x46UdIzx9Ip/ZW3ZDCHpzzyh/FzXKKPW3fV5BpPRwec2ABDTSQ1uFZwTg== X-Received: by 10.223.173.163 with SMTP id w32mr2111229wrc.204.1518545006310; Tue, 13 Feb 2018 10:03:26 -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 i6sm11790039wrc.46.2018.02.13.10.03.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Feb 2018 10:03:25 -0800 (PST) Received: by macbookpro.malat.net (Postfix, from userid 1000) id 8F99910C04A4; Tue, 13 Feb 2018 19:03:24 +0100 (CET) From: Mathieu Malaterre To: Bartlomiej Zolnierkiewicz Cc: Mathieu Malaterre , Benjamin Herrenschmidt , Tomi Valkeinen , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v5] Fix loading of module radeonfb on PowerMac Date: Tue, 13 Feb 2018 19:03:16 +0100 Message-Id: <20180213180316.11934-1-malat@debian.org> X-Mailer: git-send-email 2.11.0 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=y 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, see commit a56f7428d753 ("drm/radeon: Add early unregister of firmware fb's"). 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 Cc: Bartlomiej Zolnierkiewicz Cc: Benjamin Herrenschmidt Cc: Tomi Valkeinen --- 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. v4: Use drm_fb_helper_remove_conflicting_framebuffers from drm_fb_helper v5: do not use drm_fb_helper_remove_conflicting_framebuffers from drm_fb_helper remove ifdef hacks since not needed once framebuffer is properly decremented drivers/video/fbdev/aty/radeon_base.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c index 87608c0b2351..e8594bbaea60 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c @@ -2255,6 +2255,23 @@ 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) @@ -2308,6 +2325,10 @@ 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) {