From patchwork Wed Jan 31 07:42:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Malaterre X-Patchwork-Id: 10193371 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 E223F60380 for ; Wed, 31 Jan 2018 07:43:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3060284C8 for ; Wed, 31 Jan 2018 07:43:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C76662850F; Wed, 31 Jan 2018 07:43:35 +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 A8D73284C8 for ; Wed, 31 Jan 2018 07:43:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752969AbeAaHnY (ORCPT ); Wed, 31 Jan 2018 02:43:24 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:53199 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752765AbeAaHnW (ORCPT ); Wed, 31 Jan 2018 02:43:22 -0500 Received: by mail-wm0-f65.google.com with SMTP id g1so6033885wmg.2; Tue, 30 Jan 2018 23:43:22 -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=mfCAREL1KzYgIuS7AT+HMOx42YKfn3SI1Ep43fNBihw=; b=A2lZqmqRTdICOG2AZ5kb+QuJWDFt3d4/MG7QCNsvgSm6Zq56fvM/9bMbvJOE3M9TGz ci8e2la7i0L5KQr3OlevumXV1yavNrmIbzQfOUvSmX2agJFzSltHFkvlSFOyabYWKAEL A/CxMs6hSeVhuU5RkLFaUtrPR2DybzaFe7egCN+zTjHOoSnf5BtxTaMDI/k9hi4/161v 36ftr92FLKoeoSj1XgieFoIOFTClYp5LUpDvdkj58jSoHTkbrgv03mCizgwW2M4WTzpy q9cytq6zgKr29J2RT9bIKPIPcUshFPryLUKwqmBXuCzm/vcwV5corxPqi+IJa0KXtG25 eGaA== 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=mfCAREL1KzYgIuS7AT+HMOx42YKfn3SI1Ep43fNBihw=; b=pXWIok8UybgD3ylkxad639FUQ+AZTw6uJs4iX3a4wI3cQyH05EJGsnoO5u02Grbk1f HCri0hqqvQZabzSUDnLaLiNVsAopyJsJZg1I0vjJOqvN5ShN7lfn+wvxflPeruE7xcmX U5i67HZTocpAnSNYwAIEwwmbkgOoKTY1GZzTh/hADHFHEAH6tbce7VSYg5am+14wliYX LtwKWAKjINahWjc7g0JYEJpGEHbJZPSa8Al2FZlHYqN9Gbj2m/DWeThS7bf5RCz3ha43 QOUlcOgQLs2Lo0h3AFrk9Aj4kWfPg8GbBhsrqmgbV1gBlhIXCtz08dJDGQjg2Ge7bb3+ nnoQ== X-Gm-Message-State: AKwxytezoOAF3+qWBzzyQrHgwU5bfKP7rLHDOCa2AO2RU3H7ScJZdsmS XF9JfY8E9uMQUWlLL8Hz99c= X-Google-Smtp-Source: AH8x225P5qOp5hWAzRxRgms5b+nGiREk3t46JhzVap06Q/AxpTQM9NE3Ta652fvWx64DsR5XY9aQzw== X-Received: by 10.28.35.200 with SMTP id j191mr15960267wmj.146.1517384601160; Tue, 30 Jan 2018 23:43:21 -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 44sm27261830wrv.0.2018.01.30.23.43.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jan 2018 23:43:19 -0800 (PST) Received: by macbookpro.malat.net (Postfix, from userid 1000) id 3FB4C10C0269; Wed, 31 Jan 2018 08:43:17 +0100 (CET) From: Mathieu Malaterre To: Bartlomiej Zolnierkiewicz Cc: Lennart Sorensen , Mathieu Malaterre , Benjamin Herrenschmidt , Tomi Valkeinen , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4] Fix loading of module radeonfb on PowerMac Date: Wed, 31 Jan 2018 08:42:45 +0100 Message-Id: <20180131074245.7306-1-malat@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171221220757.24672-1-malat@debian.org> References: <20171221220757.24672-1-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, see commit a56f7428d753 ("drm/radeon: Add early unregister of firmware fb's"). 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 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 drivers/video/fbdev/aty/radeon_base.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c index 4d77daeecf99..ae669f424537 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c @@ -70,6 +70,7 @@ #include #include #include +#include #include #include @@ -2259,6 +2260,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); + + drm_fb_helper_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 +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) { +#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 +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_FB_OF err_release_pci0: pci_release_region(pdev, 0); err_release_fb: framebuffer_release(info); +#endif err_disable: err_out: return ret;