From mboxrd@z Thu Jan 1 00:00:00 1970 From: bhelgaas@google.com (Bjorn Helgaas) Date: Tue, 12 Feb 2013 14:34:40 -0700 Subject: Building DRM for i.MX fails with linux-next 20130212 In-Reply-To: References: Message-ID: <20130212213440.GA27624@google.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.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); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: Re: Building DRM for i.MX fails with linux-next 20130212 Date: Tue, 12 Feb 2013 14:34:40 -0700 Message-ID: <20130212213440.GA27624@google.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Fabio Estevam Cc: Marek =?utf-8?B?VmHFoXV0?= , pawel.moll@arm.com, DRI mailing list , Sascha Hauer , linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBGZWIgMTIsIDIwMTMgYXQgMDc6MjA6MzBQTSAtMDIwMCwgRmFiaW8gRXN0ZXZhbSB3 cm90ZToKPiBEYXZlL0Jqb3JuLAo+IAo+IE9uIFR1ZSwgRmViIDEyLCAyMDEzIGF0IDM6NTAgUE0s IEZhYmlvIEVzdGV2YW0gPGZlc3RldmFtQGdtYWlsLmNvbT4gd3JvdGU6Cj4gPiBIaSwKPiA+Cj4g PiBCdWlsZGluZyBpbXhfdjZfdjdfZGVmY29uZmlnIG9uIGxpbnV4LW5leHQgMjAxMzAyMTIgZ2l2 ZXMgbWUgdGhlCj4gPiBmb2xsb3dpbmcgYnVpbGQgZXJyb3I6Cj4gPgo+ID4gICBDQyAgICAgIGRy aXZlcnMvZ3B1L2RybS9kcm1fcGNpLm8KPiA+IGRyaXZlcnMvZ3B1L2RybS9kcm1fcGNpLmM6IElu IGZ1bmN0aW9uIOKAmGRybV9wY2llX2dldF9zcGVlZF9jYXBfbWFza+KAmToKPiA+IGRyaXZlcnMv Z3B1L2RybS9kcm1fcGNpLmM6NDg1OjI6IGVycm9yOiBpbXBsaWNpdCBkZWNsYXJhdGlvbiBvZgo+ ID4gZnVuY3Rpb24g4oCYcGNpZV9jYXBhYmlsaXR5X3JlYWRfZHdvcmTigJkKPiA+IFstV2Vycm9y PWltcGxpY2l0LWZ1bmN0aW9uLWRlY2xhcmF0aW9uXQo+IAo+ICxhbmQgaXQgaXMgY2F1c2VkIGJ5 IGNvbW1pdDoKPiAKPiBjb21taXQgZGQ2NmNjMmUxZjQ3NjVkMGU2ZjM5ZWIxZTdkOGQ2NGQzZjFj YzUyMgo+IEF1dGhvcjogQmpvcm4gSGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4KPiBEYXRl OiAgIEZyaSBKYW4gNCAxOToxMDo0MiAyMDEzICswMDAwCj4gCj4gICAgIGRybS9wY2k6IFVzZSBQ Q0kgRXhwcmVzcyBDYXBhYmlsaXR5IGFjY2Vzc29ycwoKSSBzZW50IERhdmUgdGhlIHBhdGNoIGJl bG93IGxhc3QgRnJpZGF5LiAgSXQncyBlc3NlbnRpYWxseSB0aGUgc2FtZQphcyB5b3VycywgRmFi aW8uCgpjb21taXQgZWQwNzA4ZTY5ZjcxZmFiNjU2YWZjMWM4OTFmM2M1NGM5YjEwNTY2NApBdXRo b3I6IEJqb3JuIEhlbGdhYXMgPGJoZWxnYWFzQGdvb2dsZS5jb20+CkRhdGU6ICAgRnJpIEZlYiA4 IDE1OjE4OjM1IDIwMTMgLTA3MDAKCiAgICBkcm0vcGNpOiBkZWZpbmUgZHJtX3BjaWVfZ2V0X3Nw ZWVkX2NhcF9tYXNrKCkgb25seSB3aGVuIENPTkZJR19QQ0k9eQogICAgCiAgICBNb3ZlIGRybV9w Y2llX2dldF9zcGVlZF9jYXBfbWFzaygpIHVuZGVyICNpZmRlZiBDT05GSUdfUENJIGJlY2F1c2Ug aXQKICAgIGl0IHVzZWQgb25seSBmb3IgUENJIGRldmljZXMgKGV2ZXJncmVlbiwgcjYwMCwgcjc3 MCksIGFuZCBpdCB1c2VzCiAgICBQQ0kgaW50ZXJmYWNlcyB0aGF0IG9ubHkgZXhpc3Qgd2hlbiBD T05GSUdfUENJPXkuCiAgICAKICAgIFByZXZpb3VzbHksIHdlIHRyaWVkIHRvIGNvbXBpbGUgZHJt X3BjaWVfZ2V0X3NwZWVkX2NhcF9tYXNrKCkgZXZlbiB3aGVuCiAgICBDT05GSUdfUENJPW4sIHdo aWNoIGZhaWxzLgogICAgCiAgICBUZXN0ZWQtYnk6IEZlbmdndWFuZyBXdSA8ZmVuZ2d1YW5nLnd1 QGludGVsLmNvbT4KICAgIFNpZ25lZC1vZmYtYnk6IEJqb3JuIEhlbGdhYXMgPGJoZWxnYWFzQGdv b2dsZS5jb20+CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9wY2kuYyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fcGNpLmMKaW5kZXggNzU0YmM5Ni4uMmI4MThjNyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2RybV9wY2kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3BjaS5j CkBAIC00MzksMzMgKzQzOSw2IEBAIGludCBkcm1fcGNpX2luaXQoc3RydWN0IGRybV9kcml2ZXIg KmRyaXZlciwgc3RydWN0IHBjaV9kcml2ZXIgKnBkcml2ZXIpCiAJcmV0dXJuIDA7CiB9CiAKLSNl bHNlCi0KLWludCBkcm1fcGNpX2luaXQoc3RydWN0IGRybV9kcml2ZXIgKmRyaXZlciwgc3RydWN0 IHBjaV9kcml2ZXIgKnBkcml2ZXIpCi17Ci0JcmV0dXJuIC0xOwotfQotCi0jZW5kaWYKLQotRVhQ T1JUX1NZTUJPTChkcm1fcGNpX2luaXQpOwotCi0vKkB9Ki8KLXZvaWQgZHJtX3BjaV9leGl0KHN0 cnVjdCBkcm1fZHJpdmVyICpkcml2ZXIsIHN0cnVjdCBwY2lfZHJpdmVyICpwZHJpdmVyKQotewot CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYsICp0bXA7Ci0JRFJNX0RFQlVHKCJcbiIpOwotCi0JaWYg KGRyaXZlci0+ZHJpdmVyX2ZlYXR1cmVzICYgRFJJVkVSX01PREVTRVQpIHsKLQkJcGNpX3VucmVn aXN0ZXJfZHJpdmVyKHBkcml2ZXIpOwotCX0gZWxzZSB7Ci0JCWxpc3RfZm9yX2VhY2hfZW50cnlf c2FmZShkZXYsIHRtcCwgJmRyaXZlci0+ZGV2aWNlX2xpc3QsIGRyaXZlcl9pdGVtKQotCQkJZHJt X3B1dF9kZXYoZGV2KTsKLQl9Ci0JRFJNX0lORk8oIk1vZHVsZSB1bmxvYWRlZFxuIik7Ci19Ci1F WFBPUlRfU1lNQk9MKGRybV9wY2lfZXhpdCk7Ci0KIGludCBkcm1fcGNpZV9nZXRfc3BlZWRfY2Fw X21hc2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyICptYXNrKQogewogCXN0cnVjdCBwY2lf ZGV2ICpyb290OwpAQCAtNTE0LDMgKzQ4NywzMCBAQCBpbnQgZHJtX3BjaWVfZ2V0X3NwZWVkX2Nh cF9tYXNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiAqbWFzaykKIAlyZXR1cm4gMDsKIH0K IEVYUE9SVF9TWU1CT0woZHJtX3BjaWVfZ2V0X3NwZWVkX2NhcF9tYXNrKTsKKworI2Vsc2UKKwor aW50IGRybV9wY2lfaW5pdChzdHJ1Y3QgZHJtX2RyaXZlciAqZHJpdmVyLCBzdHJ1Y3QgcGNpX2Ry aXZlciAqcGRyaXZlcikKK3sKKwlyZXR1cm4gLTE7Cit9CisKKyNlbmRpZgorCitFWFBPUlRfU1lN Qk9MKGRybV9wY2lfaW5pdCk7CisKKy8qQH0qLwordm9pZCBkcm1fcGNpX2V4aXQoc3RydWN0IGRy bV9kcml2ZXIgKmRyaXZlciwgc3RydWN0IHBjaV9kcml2ZXIgKnBkcml2ZXIpCit7CisJc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgKnRtcDsKKwlEUk1fREVCVUcoIlxuIik7CisKKwlpZiAoZHJpdmVy LT5kcml2ZXJfZmVhdHVyZXMgJiBEUklWRVJfTU9ERVNFVCkgeworCQlwY2lfdW5yZWdpc3Rlcl9k cml2ZXIocGRyaXZlcik7CisJfSBlbHNlIHsKKwkJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKGRl diwgdG1wLCAmZHJpdmVyLT5kZXZpY2VfbGlzdCwgZHJpdmVyX2l0ZW0pCisJCQlkcm1fcHV0X2Rl dihkZXYpOworCX0KKwlEUk1fSU5GTygiTW9kdWxlIHVubG9hZGVkXG4iKTsKK30KK0VYUE9SVF9T WU1CT0woZHJtX3BjaV9leGl0KTsKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK