From patchwork Tue Feb 12 21:34:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 2132221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id F3D81DFB7B for ; Tue, 12 Feb 2013 21:39:52 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5NV0-0001Ln-De; Tue, 12 Feb 2013 21:34:46 +0000 Received: from mail-ye0-f202.google.com ([209.85.213.202]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U5NUx-0001LV-6u for linux-arm-kernel@lists.infradead.org; Tue, 12 Feb 2013 21:34:43 +0000 Received: by mail-ye0-f202.google.com with SMTP id r9so60430yen.3 for ; Tue, 12 Feb 2013 13:34:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=DL8rhJ0oMYlrCOKGzt/DmWiKRNtFstS2fGY1JV3tpBw=; b=m10J1Tf6URmjI6iL3NLMHO2XNWRZTH4pgGw/A83SwPKp2T0wFpxZb40V/TqrWEnJWD 6Yuvtk9zhJeST+2Hh+LvmyLeHLn5QiHL8C/eirvioVCmgpBiF303P1766/z40waqrJG5 NZr8AllgS4GRCgJH7nm91rZSFAKTCKHnFBEjQ1siw02zLH8xN4NQqXr68iZZFvfJoOPn Ag+MMc5AtvlvJJiVPTDx+nayaaBj3Zy1MfdoEzw3E6RQyphcBRm5Is5Hv4I2RcLQbj61 qiqdNNloBsfvcPMtKdviyl5YW5E12xvjFL++8Ar31MgX1OfEbiO4+oIROBV4lnqnVt/m gD3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition :content-transfer-encoding:in-reply-to:user-agent:x-gm-message-state; bh=DL8rhJ0oMYlrCOKGzt/DmWiKRNtFstS2fGY1JV3tpBw=; b=ECgDPC/s2HUFGwWH09JKOR7iwkfh6x3r8SMvUSSbPhlHbbcdWPWyGDLTzgGc//HI5J wGKoS3E7mQ3PN0puRs6hNSaPtmKMhFPCGwvsb65TcvLRdlnRx+o7EGBPOnZoz+vaW4fe HqpQuYcWrOZ3zA7mU2o4uRp+ZwYoX365Eowo1wJJ6cqFNzsGwO4Eu0GB4aZ0pROCqYx2 s3dsJdYX9YQ1w867a8XgYdZW8VvqvvB3o0n7hWtcXwBwwq/hOZF1lip4CABpPqbi0BMP X8zQkwNjM+lmZz4Udi55/C1Xc0NG64Svy+yHIpkB+6gAp/dUykNNRz+4FrVtKIxadAI/ 1s0Q== X-Received: by 10.101.116.13 with SMTP id t13mr2185200anm.12.1360704881290; Tue, 12 Feb 2013 13:34:41 -0800 (PST) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id x63si1901209yhl.2.2013.02.12.13.34.41 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 12 Feb 2013 13:34:41 -0800 (PST) Received: from bhelgaas.mtv.corp.google.com (bhelgaas.mtv.corp.google.com [172.17.131.112]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 0063431C1CF; Tue, 12 Feb 2013 13:34:41 -0800 (PST) Received: by bhelgaas.mtv.corp.google.com (Postfix, from userid 131485) id A01B518115D; Tue, 12 Feb 2013 13:34:40 -0800 (PST) Date: Tue, 12 Feb 2013 14:34:40 -0700 From: Bjorn Helgaas To: Fabio Estevam Subject: Re: Building DRM for i.MX fails with linux-next 20130212 Message-ID: <20130212213440.GA27624@google.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) X-Gm-Message-State: ALoCoQmmJ38b0qmLHjfa1dqWB6yd/vXat1D7qaPfEftLhkPf9+Xe6UmWeETcmvqsYPQkqTLglQGKy3wzPChRSCGD38kTNJrbBdH43NwuI6s8tGF/SijbTM4aJzV1/TLbYRpHQhaOh2zxcIHb5UFELtuUCIoa54qNJnLxfASla6Q39tJzJBbXWd1zR2rJpcJ1xWhM1/hFYAh5vWYKus65kFYKKzhklB/bmw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130212_163443_284846_1BDB28EE X-CRM114-Status: GOOD ( 18.06 ) X-Spam-Score: -3.4 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.213.202 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Marek =?utf-8?B?VmHFoXV0?= , pawel.moll@arm.com, airlied@linux.ie, DRI mailing list , Sascha Hauer , Shawn Guo , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Tue, Feb 12, 2013 at 07:20:30PM -0200, Fabio Estevam wrote: > Dave/Bjorn, > > On Tue, Feb 12, 2013 at 3:50 PM, Fabio Estevam wrote: > > Hi, > > > > Building imx_v6_v7_defconfig on linux-next 20130212 gives me the > > following build error: > > > > CC drivers/gpu/drm/drm_pci.o > > drivers/gpu/drm/drm_pci.c: In function ‘drm_pcie_get_speed_cap_mask’: > > drivers/gpu/drm/drm_pci.c:485:2: error: implicit declaration of > > function ‘pcie_capability_read_dword’ > > [-Werror=implicit-function-declaration] > > ,and it is caused by commit: > > commit dd66cc2e1f4765d0e6f39eb1e7d8d64d3f1cc522 > Author: Bjorn Helgaas > Date: Fri Jan 4 19:10:42 2013 +0000 > > drm/pci: Use PCI Express Capability accessors I sent Dave the patch below last Friday. It's essentially the same as yours, Fabio. commit ed0708e69f71fab656afc1c891f3c54c9b105664 Author: Bjorn Helgaas Date: Fri Feb 8 15:18:35 2013 -0700 drm/pci: define drm_pcie_get_speed_cap_mask() only when CONFIG_PCI=y Move drm_pcie_get_speed_cap_mask() under #ifdef CONFIG_PCI because it it used only for PCI devices (evergreen, r600, r770), and it uses PCI interfaces that only exist when CONFIG_PCI=y. Previously, we tried to compile drm_pcie_get_speed_cap_mask() even when CONFIG_PCI=n, which fails. Tested-by: Fengguang Wu Signed-off-by: Bjorn Helgaas diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 754bc96..2b818c7 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -439,33 +439,6 @@ int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) return 0; } -#else - -int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) -{ - return -1; -} - -#endif - -EXPORT_SYMBOL(drm_pci_init); - -/*@}*/ -void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver) -{ - struct drm_device *dev, *tmp; - DRM_DEBUG("\n"); - - if (driver->driver_features & DRIVER_MODESET) { - pci_unregister_driver(pdriver); - } else { - list_for_each_entry_safe(dev, tmp, &driver->device_list, driver_item) - drm_put_dev(dev); - } - DRM_INFO("Module unloaded\n"); -} -EXPORT_SYMBOL(drm_pci_exit); - int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask) { struct pci_dev *root; @@ -514,3 +487,30 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask) return 0; } EXPORT_SYMBOL(drm_pcie_get_speed_cap_mask); + +#else + +int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) +{ + return -1; +} + +#endif + +EXPORT_SYMBOL(drm_pci_init); + +/*@}*/ +void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver) +{ + struct drm_device *dev, *tmp; + DRM_DEBUG("\n"); + + if (driver->driver_features & DRIVER_MODESET) { + pci_unregister_driver(pdriver); + } else { + list_for_each_entry_safe(dev, tmp, &driver->device_list, driver_item) + drm_put_dev(dev); + } + DRM_INFO("Module unloaded\n"); +} +EXPORT_SYMBOL(drm_pci_exit);