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: 2132211 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id D29B73FD4F for ; Tue, 12 Feb 2013 21:34:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 92732E64B9 for ; Tue, 12 Feb 2013 13:34:52 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vc0-f202.google.com (mail-vc0-f202.google.com [209.85.220.202]) by gabe.freedesktop.org (Postfix) with ESMTP id 33FF0E5D1B for ; Tue, 12 Feb 2013 13:34:42 -0800 (PST) Received: by mail-vc0-f202.google.com with SMTP id m8so60532vcd.5 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=DaZ9jn6/hGkFQd4vjO/cxOFaqKU3piQE933Tnod95doVhcd23LfveY4oflbV8UKeyw 3lxZQOf4eSnQVjgbrDw6iVv+XnV8Lyt3c/e8dX/SDu/FbDQ2fLKDk/v0epuXbq0+DzqD D4txxOC5x6L5i31VFGcnpPnRPFOTQOZsXYKuM3h9zACGb7o61m6iYaPp7nzfK6uEGL2k Elyy7Lg2MSORy7s+M5rHmat4Pdy1kxi3nYoCD4AUnTV/FWRgBIl+MfJNFtYffgl4ixL4 eGXbEqwa4iUCxAUsa8kpDWX+oqHp6HVFCwAnupnYebNx5LRL/2c+A1NdxuKdGKTrDcy+ ogOw== 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: ALoCoQkm66/qTIInMC1meaMqZRbX+s/q6n8kCllqAQddwvSxCgP35aJZzXzaLCba4nbtIXR/gc2Fy+CrwX0lrWRpk5jVVxsvwsWpGOwlowxZHbaLPgmkyXOmJHauCtVoYSeZWctZSQLAztZms0cl45U0z4204E8WVIReycWc8d+DgltzV5OmegxJvfsF68ElI2kCrZKNnBWNLywAwtbQV/6qsWsY5ocdgA== Cc: Marek =?utf-8?B?VmHFoXV0?= , pawel.moll@arm.com, DRI mailing list , Sascha Hauer , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.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);