drm/sti: Depend on OF rather than selecting it
Subsystems (4)
PATCH 1/1 drm/sti: Depend on OF rather than selecting it
Commit cc6b741c6f63 ("drm: sti: remove useless fields from vtg structure") reworked some code inside of this driver and made it select CONFIG_OF. This results in the entire OF layer being enabled when building an allmodconfig on ia64. OF on ia64 is completely unsupported so this isn't a great state of affairs.
The 0day robot noticed a link-time failure on ia64 caused by using of_node_to_nid() in an otherwise unrelated driver. The generic fallback for of_node_to_nid() only exists when:
defined(CONFIG_OF) && defined(CONFIG_NUMA) == false
Since CONFIG_NUMA is usually selected for IA64 we get the link failure. Fix this by making the driver depend on OF rather than selecting it, odds are that was the original intent.
---
Cc`ed to stable since the ia64 guys might want it backported. I'm not bothered if it just goes into mainline.
--- drivers/gpu/drm/sti/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/sti/Kconfig +1 -2
@@ -1,6 +1,6 @@ config DRM_STI tristate "DRM Support for STMicroelectronics SoC stiH4xx Series" - depends on DRM && (ARCH_STI || ARCH_MULTIPLATFORM) + depends on OF && DRM && (ARCH_STI || ARCH_MULTIPLATFORM) select RESET_CONTROLLER select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER
@@ -8,6 +8,5 @@ config DRM_STI select DRM_PANEL select FW_LOADER select SND_SOC_HDMI_CODEC if SND_SOC - select OF help Choose this option to enable DRM on STM stiH4xx chipset
Signature · 1 line
2.9.5
2018-04-03 7:34 GMT+02:00 Oliver O'Halloran <[email protected]>:
Quoted 16 lines
Commit
cc6b741c6f63("drm: sti: remove useless fields from vtg structure") reworked some code inside of this driver and made it selectCONFIG_OF. This results in the entire OF layer being enabled when building an allmodconfig on ia64. OF on ia64 is completely unsupported so this isn't a great state of affairs.The 0day robot noticed a link-time failure on ia64 caused by using
of_node_to_nid()in an otherwise unrelated driver. The generic fallback forof_node_to_nid()only exists when:defined(CONFIG_OF) && defined(CONFIG_NUMA) = falseSince
CONFIG_NUMAis usually selected for IA64 we get the link failure. Fix this by making the driver depend on OF rather than selecting it, odds are that was the original intent.
Quoted 9 lines
Fixes cc6b741c6f63 ("drm: sti: remove useless fields from vtg structure")Cc Benjamin Gaignard <[email protected]>Cc Vincent Abriou <[email protected]>Cc David Airlie <[email protected]>Signed-off-by Oliver O'Halloran <[email protected]>
Quoted 29 lines
---
Cc`ed to stable since the ia64 guys might want it backported. I'm not bothered if it just goes into mainline.--- drivers/gpu/drm/sti/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/gpu/drm/sti/Kconfig +1
-3@@ -1,6 +1,6 @@ config DRM_STI tristate "DRM Support for STMicroelectronics SoC stiH4xx Series" - depends on DRM && (ARCH_STI || ARCH_MULTIPLATFORM) + depends on OF && DRM && (ARCH_STI || ARCH_MULTIPLATFORM) select RESET_CONTROLLER select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER@@ -8,6 +8,5 @@ config DRM_STI select DRM_PANEL select FW_LOADER select SND_SOC_HDMI_CODEC if SND_SOC - select OF help Choose this option to enable DRM on STM stiH4xx chipset --2.9.5
DQoNCk9uIDA0LzA1LzIwMTggMDE6MDUgUE0sIEJlbmphbWluIEdhaWduYXJkIHdyb3RlOg0KPiAy MDE4LTA0LTAzIDc6MzQgR01UKzAyOjAwIE9saXZlciBPJ0hhbGxvcmFuIDxvb2hhbGxAZ21haWwu Y29tPjoNCj4+IENvbW1pdCBjYzZiNzQxYzZmNjMgKCJkcm06IHN0aTogcmVtb3ZlIHVzZWxlc3Mg ZmllbGRzIGZyb20gdnRnDQo+PiBzdHJ1Y3R1cmUiKSByZXdvcmtlZCBzb21lIGNvZGUgaW5zaWRl IG9mIHRoaXMgZHJpdmVyIGFuZCBtYWRlIGl0IHNlbGVjdA0KPj4gQ09ORklHX09GLiBUaGlzIHJl c3VsdHMgaW4gdGhlIGVudGlyZSBPRiBsYXllciBiZWluZyBlbmFibGVkIHdoZW4NCj4+IGJ1aWxk aW5nIGFuIGFsbG1vZGNvbmZpZyBvbiBpYTY0LiBPRiBvbiBpYTY0IGlzIGNvbXBsZXRlbHkgdW5z dXBwb3J0ZWQNCj4+IHNvIHRoaXMgaXNuJ3QgYSBncmVhdCBzdGF0ZSBvZiBhZmZhaXJzLg0KPj4N Cj4+IFRoZSAwZGF5IHJvYm90IG5vdGljZWQgYSBsaW5rLXRpbWUgZmFpbHVyZSBvbiBpYTY0IGNh dXNlZCBieQ0KPj4gdXNpbmcgb2Zfbm9kZV90b19uaWQoKSBpbiBhbiBvdGhlcndpc2UgdW5yZWxh dGVkIGRyaXZlci4gVGhlDQo+PiBnZW5lcmljIGZhbGxiYWNrIGZvciBvZl9ub2RlX3RvX25pZCgp IG9ubHkgZXhpc3RzIHdoZW46DQo+Pg0KPj4gICAgICAgICAgZGVmaW5lZChDT05GSUdfT0YpICYm IGRlZmluZWQoQ09ORklHX05VTUEpID09IGZhbHNlDQo+Pg0KPj4gU2luY2UgQ09ORklHX05VTUEg aXMgdXN1YWxseSBzZWxlY3RlZCBmb3IgSUE2NCB3ZSBnZXQgdGhlIGxpbmsgZmFpbHVyZS4NCj4+ IEZpeCB0aGlzIGJ5IG1ha2luZyB0aGUgZHJpdmVyIGRlcGVuZCBvbiBPRiByYXRoZXIgdGhhbiBz ZWxlY3RpbmcgaXQsDQo+PiBvZGRzIGFyZSB0aGF0IHdhcyB0aGUgb3JpZ2luYWwgaW50ZW50Lg0K Pj4NCj4+IExpbms6IGh0dHBzOi8vbGlzdHMuMDEub3JnL3BpcGVybWFpbC9rYnVpbGQtYWxsLzIw MTgtTWFyY2gvMDQ1MTcyLmh0bWwNCj4+IEZpeGVzOiBjYzZiNzQxYzZmNjMgKCJkcm06IHN0aTog cmVtb3ZlIHVzZWxlc3MgZmllbGRzIGZyb20gdnRnIHN0cnVjdHVyZSIpDQo+PiBDYzogQmVuamFt aW4gR2FpZ25hcmQgPGJlbmphbWluLmdhaWduYXJkQGxpbmFyby5vcmc+DQo+PiBDYzogVmluY2Vu dCBBYnJpb3UgPHZpbmNlbnQuYWJyaW91QHN0LmNvbT4NCj4+IENjOiBEYXZpZCBBaXJsaWUgPGFp cmxpZWRAbGludXguaWU+DQo+PiBDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZw0K Pj4gQ2M6IGxpbnV4LWlhNjRAdmdlci5rZXJuZWwub3JnDQo+PiBDYzogc3RhYmxlQHZnZXIua2Vy bmVsLm9yZw0KPj4gU2lnbmVkLW9mZi1ieTogT2xpdmVyIE8nSGFsbG9yYW4gPG9vaGFsbEBnbWFp bC5jb20+DQo+IA0KPiBSZXZpZXdlZC1ieTogQmVuamFtaW4gR2FpZ25hcmQgPGJlbmphbWluLmdh aWduYXJkQGxpbmFyby5vcmc+DQoNCkFwcGxpZWQgb24gZHJtLW1pc2MtbmV4dA0KDQpNYW55IHRo YW5rcyBmb3IgeW91ciBwYXRjaCwNClBoaWxpcHBlIDotKQ0KDQo+IA0KPj4gLS0tDQo+PiBDY2Bl ZCB0byBzdGFibGUgc2luY2UgdGhlIGlhNjQgZ3V5cyBtaWdodCB3YW50IGl0IGJhY2twb3J0ZWQu IEknbSBub3QNCj4+IGJvdGhlcmVkIGlmIGl0IGp1c3QgZ29lcyBpbnRvIG1haW5saW5lLg0KPj4g LS0tDQo+PiAgIGRyaXZlcnMvZ3B1L2RybS9zdGkvS2NvbmZpZyB8IDMgKy0tDQo+PiAgIDEgZmls ZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMiBkZWxldGlvbnMoLSkNCj4+DQo+PiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3N0aS9LY29uZmlnIGIvZHJpdmVycy9ncHUvZHJtL3N0aS9L Y29uZmlnDQo+PiBpbmRleCBjY2E0YjNjOWFlYjUuLjE5NjNjYzFiMWNjNSAxMDA2NDQNCj4+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9zdGkvS2NvbmZpZw0KPj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L3N0aS9LY29uZmlnDQo+PiBAQCAtMSw2ICsxLDYgQEANCj4+ICAgY29uZmlnIERSTV9TVEkNCj4+ ICAgICAgICAgIHRyaXN0YXRlICJEUk0gU3VwcG9ydCBmb3IgU1RNaWNyb2VsZWN0cm9uaWNzIFNv QyBzdGlINHh4IFNlcmllcyINCj4+IC0gICAgICAgZGVwZW5kcyBvbiBEUk0gJiYgKEFSQ0hfU1RJ IHx8IEFSQ0hfTVVMVElQTEFURk9STSkNCj4+ICsgICAgICAgZGVwZW5kcyBvbiBPRiAmJiBEUk0g JiYgKEFSQ0hfU1RJIHx8IEFSQ0hfTVVMVElQTEFURk9STSkNCj4+ICAgICAgICAgIHNlbGVjdCBS RVNFVF9DT05UUk9MTEVSDQo+PiAgICAgICAgICBzZWxlY3QgRFJNX0tNU19IRUxQRVINCj4+ICAg ICAgICAgIHNlbGVjdCBEUk1fR0VNX0NNQV9IRUxQRVINCj4+IEBAIC04LDYgKzgsNSBAQCBjb25m aWcgRFJNX1NUSQ0KPj4gICAgICAgICAgc2VsZWN0IERSTV9QQU5FTA0KPj4gICAgICAgICAgc2Vs ZWN0IEZXX0xPQURFUg0KPj4gICAgICAgICAgc2VsZWN0IFNORF9TT0NfSERNSV9DT0RFQyBpZiBT TkRfU09DDQo+PiAtICAgICAgIHNlbGVjdCBPRg0KPj4gICAgICAgICAgaGVscA0KPj4gICAgICAg ICAgICBDaG9vc2UgdGhpcyBvcHRpb24gdG8gZW5hYmxlIERSTSBvbiBTVE0gc3RpSDR4eCBjaGlw c2V0DQo+PiAtLQ0KPj4gMi45LjUNCj4+DQo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fDQo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QNCj4gZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZw0KPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA0KPiA
Hi,
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag, fixing commit: cc6b741c6f63 drm: sti: remove useless fields from vtg structure.
The bot has also determined it's probably a bug fixing patch. (score: 96.6729)
The bot has tested the following trees: v4.16.
v4.16: Build OK!