From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Fri, 6 Jul 2018 14:45:53 +0200 Subject: [PATCH] drm/sun4i: fix build failure with CONFIG_DRM_SUN8I_MIXER=m Message-ID: <20180706124628.3192421-1-arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Having DRM_SUN4I built-in but DRM_SUN8I_MIXER as a loadable module results in a link error, as we try to access a symbol from the sun8i_tcon_top.ko module: ERROR: "sun8i_tcon_top_of_table" [drivers/gpu/drm/sun4i/sun8i-drm-hdmi.ko] undefined! ERROR: "sun8i_tcon_top_of_table" [drivers/gpu/drm/sun4i/sun4i-drm.ko] undefined! This solves the problem by making DRM_SUN8I_MIXER a 'bool' symbol, building the sun8i_tcon_top module the same way as the core sun4i-drm module whenever DRM_SUN8I_MIXER is enabled, or not building it at all otherwise. Alternatively, we could always build sun8i_tcon_top.ko along with sun4-drm.ko and detach it from the mixer module, I could not tell which way is more appropriate here. Fixes: 57e23de02f48 ("drm/sun4i: DW HDMI: Expand algorithm for possible crtcs") Fixes: ef0cf6441fbb ("drm/sun4i: Add support for traversing graph with TCON TOP") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/sun4i/Kconfig | 2 +- drivers/gpu/drm/sun4i/Makefile | 4 +++- drivers/gpu/drm/sun4i/sun4i_drv.c | 3 ++- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig index 156a865c3e6d..709461deb1c0 100644 --- a/drivers/gpu/drm/sun4i/Kconfig +++ b/drivers/gpu/drm/sun4i/Kconfig @@ -60,7 +60,7 @@ config DRM_SUN8I_DW_HDMI selected the module will be called sun8i_dw_hdmi. config DRM_SUN8I_MIXER - tristate "Support for Allwinner Display Engine 2.0 Mixer" + bool "Support for Allwinner Display Engine 2.0 Mixer" default MACH_SUN8I help Choose this option if you have an Allwinner SoC with the diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile index cd27d02c94e2..11de3cd52dae 100644 --- a/drivers/gpu/drm/sun4i/Makefile +++ b/drivers/gpu/drm/sun4i/Makefile @@ -39,4 +39,6 @@ endif obj-$(CONFIG_DRM_SUN4I_HDMI) += sun4i-drm-hdmi.o obj-$(CONFIG_DRM_SUN6I_DSI) += sun6i-dsi.o obj-$(CONFIG_DRM_SUN8I_DW_HDMI) += sun8i-drm-hdmi.o -obj-$(CONFIG_DRM_SUN8I_MIXER) += sun8i-mixer.o sun8i_tcon_top.o +ifdef CONFIG_DRM_SUN8I_MIXER +obj-$(CONFIG_DRM_SUN4I) += sun8i-mixer.o sun8i_tcon_top.o +endif diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 6ddf4eaccb40..7551dcb34c71 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -216,7 +216,8 @@ static bool sun4i_drv_node_is_tcon_with_ch0(struct device_node *node) static bool sun4i_drv_node_is_tcon_top(struct device_node *node) { - return !!of_match_node(sun8i_tcon_top_of_table, node); + return IS_ENABLED(CONFIG_DRM_SUN8I_MIXER) && + !!of_match_node(sun8i_tcon_top_of_table, node); } static int compare_of(struct device *dev, void *data) diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c index 3459b9ec56c9..b18c8f175dba 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c @@ -44,7 +44,8 @@ sun8i_dw_hdmi_mode_valid(struct drm_connector *connector, static bool sun8i_dw_hdmi_node_is_tcon_top(struct device_node *node) { - return !!of_match_node(sun8i_tcon_top_of_table, node); + return IS_ENABLED(CONFIG_DRM_SUN8I_MIXER) && + !!of_match_node(sun8i_tcon_top_of_table, node); } static u32 sun8i_dw_hdmi_find_possible_crtcs(struct drm_device *drm, -- 2.9.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH] drm/sun4i: fix build failure with CONFIG_DRM_SUN8I_MIXER=m Date: Fri, 6 Jul 2018 14:45:53 +0200 Message-ID: <20180706124628.3192421-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 256366F015 for ; Fri, 6 Jul 2018 12:46:46 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maxime Ripard , David Airlie , Chen-Yu Tsai Cc: Jernej Skrabec , Arnd Bergmann , Jonathan Liu , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Hans Verkuil , linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org SGF2aW5nIERSTV9TVU40SSBidWlsdC1pbiBidXQgRFJNX1NVTjhJX01JWEVSIGFzIGEgbG9hZGFi bGUgbW9kdWxlIHJlc3VsdHMgaW4KYSBsaW5rIGVycm9yLCBhcyB3ZSB0cnkgdG8gYWNjZXNzIGEg c3ltYm9sIGZyb20gdGhlIHN1bjhpX3Rjb25fdG9wLmtvIG1vZHVsZToKCkVSUk9SOiAic3VuOGlf dGNvbl90b3Bfb2ZfdGFibGUiIFtkcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuOGktZHJtLWhkbWku a29dIHVuZGVmaW5lZCEKRVJST1I6ICJzdW44aV90Y29uX3RvcF9vZl90YWJsZSIgW2RyaXZlcnMv Z3B1L2RybS9zdW40aS9zdW40aS1kcm0ua29dIHVuZGVmaW5lZCEKClRoaXMgc29sdmVzIHRoZSBw cm9ibGVtIGJ5IG1ha2luZyBEUk1fU1VOOElfTUlYRVIgYSAnYm9vbCcgc3ltYm9sLCBidWlsZGlu Zwp0aGUgc3VuOGlfdGNvbl90b3AgbW9kdWxlIHRoZSBzYW1lIHdheSBhcyB0aGUgY29yZSBzdW40 aS1kcm0gbW9kdWxlIHdoZW5ldmVyCkRSTV9TVU44SV9NSVhFUiBpcyBlbmFibGVkLCBvciBub3Qg YnVpbGRpbmcgaXQgYXQgYWxsIG90aGVyd2lzZS4KCkFsdGVybmF0aXZlbHksIHdlIGNvdWxkIGFs d2F5cyBidWlsZCBzdW44aV90Y29uX3RvcC5rbyBhbG9uZyB3aXRoIHN1bjQtZHJtLmtvCmFuZCBk ZXRhY2ggaXQgZnJvbSB0aGUgbWl4ZXIgbW9kdWxlLCBJIGNvdWxkIG5vdCB0ZWxsIHdoaWNoIHdh eSBpcyBtb3JlCmFwcHJvcHJpYXRlIGhlcmUuCgpGaXhlczogNTdlMjNkZTAyZjQ4ICgiZHJtL3N1 bjRpOiBEVyBIRE1JOiBFeHBhbmQgYWxnb3JpdGhtIGZvciBwb3NzaWJsZSBjcnRjcyIpCkZpeGVz OiBlZjBjZjY0NDFmYmIgKCJkcm0vc3VuNGk6IEFkZCBzdXBwb3J0IGZvciB0cmF2ZXJzaW5nIGdy YXBoIHdpdGggVENPTiBUT1AiKQpTaWduZWQtb2ZmLWJ5OiBBcm5kIEJlcmdtYW5uIDxhcm5kQGFy bmRiLmRlPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9zdW40aS9LY29uZmlnICAgICAgICAgfCAyICst CiBkcml2ZXJzL2dwdS9kcm0vc3VuNGkvTWFrZWZpbGUgICAgICAgIHwgNCArKystCiBkcml2ZXJz L2dwdS9kcm0vc3VuNGkvc3VuNGlfZHJ2LmMgICAgIHwgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9z dW40aS9zdW44aV9kd19oZG1pLmMgfCAzICsrLQogNCBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlv bnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3N1bjRp L0tjb25maWcgYi9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvS2NvbmZpZwppbmRleCAxNTZhODY1YzNl NmQuLjcwOTQ2MWRlYjFjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3N1bjRpL0tjb25m aWcKKysrIGIvZHJpdmVycy9ncHUvZHJtL3N1bjRpL0tjb25maWcKQEAgLTYwLDcgKzYwLDcgQEAg Y29uZmlnIERSTV9TVU44SV9EV19IRE1JCiAJICBzZWxlY3RlZCB0aGUgbW9kdWxlIHdpbGwgYmUg Y2FsbGVkIHN1bjhpX2R3X2hkbWkuCiAKIGNvbmZpZyBEUk1fU1VOOElfTUlYRVIKLQl0cmlzdGF0 ZSAiU3VwcG9ydCBmb3IgQWxsd2lubmVyIERpc3BsYXkgRW5naW5lIDIuMCBNaXhlciIKKwlib29s ICJTdXBwb3J0IGZvciBBbGx3aW5uZXIgRGlzcGxheSBFbmdpbmUgMi4wIE1peGVyIgogCWRlZmF1 bHQgTUFDSF9TVU44SQogCWhlbHAKIAkgIENob29zZSB0aGlzIG9wdGlvbiBpZiB5b3UgaGF2ZSBh biBBbGx3aW5uZXIgU29DIHdpdGggdGhlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vc3Vu NGkvTWFrZWZpbGUgYi9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvTWFrZWZpbGUKaW5kZXggY2QyN2Qw MmM5NGUyLi4xMWRlM2NkNTJkYWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9zdW40aS9N YWtlZmlsZQorKysgYi9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvTWFrZWZpbGUKQEAgLTM5LDQgKzM5 LDYgQEAgZW5kaWYKIG9iai0kKENPTkZJR19EUk1fU1VONElfSERNSSkJKz0gc3VuNGktZHJtLWhk bWkubwogb2JqLSQoQ09ORklHX0RSTV9TVU42SV9EU0kpCSs9IHN1bjZpLWRzaS5vCiBvYmotJChD T05GSUdfRFJNX1NVTjhJX0RXX0hETUkpCSs9IHN1bjhpLWRybS1oZG1pLm8KLW9iai0kKENPTkZJ R19EUk1fU1VOOElfTUlYRVIpCSs9IHN1bjhpLW1peGVyLm8gc3VuOGlfdGNvbl90b3AubworaWZk ZWYgQ09ORklHX0RSTV9TVU44SV9NSVhFUgorb2JqLSQoQ09ORklHX0RSTV9TVU40SSkJCSs9IHN1 bjhpLW1peGVyLm8gc3VuOGlfdGNvbl90b3AubworZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9zdW40aS9zdW40aV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9zdW40aS9zdW40aV9k cnYuYwppbmRleCA2ZGRmNGVhY2NiNDAuLjc1NTFkY2IzNGM3MSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3N1bjRpL3N1bjRpX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9zdW40aS9z dW40aV9kcnYuYwpAQCAtMjE2LDcgKzIxNiw4IEBAIHN0YXRpYyBib29sIHN1bjRpX2Rydl9ub2Rl X2lzX3Rjb25fd2l0aF9jaDAoc3RydWN0IGRldmljZV9ub2RlICpub2RlKQogCiBzdGF0aWMgYm9v bCBzdW40aV9kcnZfbm9kZV9pc190Y29uX3RvcChzdHJ1Y3QgZGV2aWNlX25vZGUgKm5vZGUpCiB7 Ci0JcmV0dXJuICEhb2ZfbWF0Y2hfbm9kZShzdW44aV90Y29uX3RvcF9vZl90YWJsZSwgbm9kZSk7 CisJcmV0dXJuIElTX0VOQUJMRUQoQ09ORklHX0RSTV9TVU44SV9NSVhFUikgJiYKKwkJISFvZl9t YXRjaF9ub2RlKHN1bjhpX3Rjb25fdG9wX29mX3RhYmxlLCBub2RlKTsKIH0KIAogc3RhdGljIGlu dCBjb21wYXJlX29mKHN0cnVjdCBkZXZpY2UgKmRldiwgdm9pZCAqZGF0YSkKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9zdW40aS9zdW44aV9kd19oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0v c3VuNGkvc3VuOGlfZHdfaGRtaS5jCmluZGV4IDM0NTliOWVjNTZjOS4uYjE4YzhmMTc1ZGJhIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuOGlfZHdfaGRtaS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9zdW40aS9zdW44aV9kd19oZG1pLmMKQEAgLTQ0LDcgKzQ0LDggQEAgc3Vu OGlfZHdfaGRtaV9tb2RlX3ZhbGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAK IHN0YXRpYyBib29sIHN1bjhpX2R3X2hkbWlfbm9kZV9pc190Y29uX3RvcChzdHJ1Y3QgZGV2aWNl X25vZGUgKm5vZGUpCiB7Ci0JcmV0dXJuICEhb2ZfbWF0Y2hfbm9kZShzdW44aV90Y29uX3RvcF9v Zl90YWJsZSwgbm9kZSk7CisJcmV0dXJuIElTX0VOQUJMRUQoQ09ORklHX0RSTV9TVU44SV9NSVhF UikgJiYKKwkJISFvZl9tYXRjaF9ub2RlKHN1bjhpX3Rjb25fdG9wX29mX3RhYmxlLCBub2RlKTsK IH0KIAogc3RhdGljIHUzMiBzdW44aV9kd19oZG1pX2ZpbmRfcG9zc2libGVfY3J0Y3Moc3RydWN0 IGRybV9kZXZpY2UgKmRybSwKLS0gCjIuOS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88131C3279B for ; Fri, 6 Jul 2018 12:47:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4673E23E47 for ; Fri, 6 Jul 2018 12:47:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4673E23E47 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933068AbeGFMrE (ORCPT ); Fri, 6 Jul 2018 08:47:04 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:48998 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932569AbeGFMrC (ORCPT ); Fri, 6 Jul 2018 08:47:02 -0400 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0Mfe8p-1flYUl0Fjv-00P5iG; Fri, 06 Jul 2018 14:46:32 +0200 From: Arnd Bergmann To: Maxime Ripard , David Airlie , Chen-Yu Tsai Cc: Arnd Bergmann , Hans Verkuil , Jernej Skrabec , Jonathan Liu , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/sun4i: fix build failure with CONFIG_DRM_SUN8I_MIXER=m Date: Fri, 6 Jul 2018 14:45:53 +0200 Message-Id: <20180706124628.3192421-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:c54e9PiOk7Wlim/U846paOiqpg2DfHAPPDpdahMj9m9tN5aT4YK cu+p95lUhbuyjabduuZnYLevHn2qMjpsdeuzJ/W2NubsHOeITcwSYid3kayZ7QHtZix7kHq 4wRB4hdDkk1v+JsOJLVgoe4UiGx+Lws/Z4AFxOkham2vwGr5GrBUHzmOAIT/rpYaPYCs9S/ Pi7dae3LLPwVx1nKHrR+g== X-UI-Out-Filterresults: notjunk:1;V01:K0:p4Z/arbfPhE=:VBLSnoU0vpNyqmFlElX5Cn CcJGaXtutVRnMDBW0qOzZ+pNRWW5qLR5/ZJ82iFzm8K2rqz8iwaKbYly8PWzxsQOpdqCibC7w VtKV7IKdWc4PhAWY7hk3gxxax7CO7UihJaMXh+l7Kfa+8h1GrT9aeFYXQmmVVmq8QcZjUsKU1 OQ4ou/sVBbTcgnvAlpnueRMyRIaPDNp5B0q8aVbjpFga3e0nzEx8BsUyZt24P4x9BY3SWPb8G Rcwe9W6Ct3wjPXcbmm2B1BEmzI3ENVSoZ4VdHNl8VdAtQVvPe/aRZqmfIp6ChQjX9wICtdXLx T9Et8JjZ4iInNm/4HGUJ+xVvhU+MDXJzxWBBIt8qRoVEM/WTTdtwum34tIompFDQDcfS8RfFA AJv2yLGQmLn8TwqDJVoIaCTG5rfRs7a1Ftrp6WLyesUjYBIWhhS/p25sSvaEKMFbrtxSRHN06 8WkVRXcukeIO8RRnIXMTiDnNKlpJ+VIhI21yLbjmXIwTxFsqAJ7WWYgwxGbhpWTd7C0EVUnJf 1XwklMYEt59mQvsGEoMmXMv9C2aMcPS++Rf79McWJsV4+xE4c6BdD/NKGVt7yzDnSnxtr8l/V IJN9Yg928Qb9MbiaV9qcSIpfRS8VzJ+dEhsoU/Y4YmAeLynnLQcd2ePe1SPrIU6jChaCpT3MY Fyk9a+4cRPTMpz0FqvXx1Is9Is/6/ti5EEW1wo5COqedOV5s2HTjriYbry8y+RuOgTKM= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Having DRM_SUN4I built-in but DRM_SUN8I_MIXER as a loadable module results in a link error, as we try to access a symbol from the sun8i_tcon_top.ko module: ERROR: "sun8i_tcon_top_of_table" [drivers/gpu/drm/sun4i/sun8i-drm-hdmi.ko] undefined! ERROR: "sun8i_tcon_top_of_table" [drivers/gpu/drm/sun4i/sun4i-drm.ko] undefined! This solves the problem by making DRM_SUN8I_MIXER a 'bool' symbol, building the sun8i_tcon_top module the same way as the core sun4i-drm module whenever DRM_SUN8I_MIXER is enabled, or not building it at all otherwise. Alternatively, we could always build sun8i_tcon_top.ko along with sun4-drm.ko and detach it from the mixer module, I could not tell which way is more appropriate here. Fixes: 57e23de02f48 ("drm/sun4i: DW HDMI: Expand algorithm for possible crtcs") Fixes: ef0cf6441fbb ("drm/sun4i: Add support for traversing graph with TCON TOP") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/sun4i/Kconfig | 2 +- drivers/gpu/drm/sun4i/Makefile | 4 +++- drivers/gpu/drm/sun4i/sun4i_drv.c | 3 ++- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig index 156a865c3e6d..709461deb1c0 100644 --- a/drivers/gpu/drm/sun4i/Kconfig +++ b/drivers/gpu/drm/sun4i/Kconfig @@ -60,7 +60,7 @@ config DRM_SUN8I_DW_HDMI selected the module will be called sun8i_dw_hdmi. config DRM_SUN8I_MIXER - tristate "Support for Allwinner Display Engine 2.0 Mixer" + bool "Support for Allwinner Display Engine 2.0 Mixer" default MACH_SUN8I help Choose this option if you have an Allwinner SoC with the diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile index cd27d02c94e2..11de3cd52dae 100644 --- a/drivers/gpu/drm/sun4i/Makefile +++ b/drivers/gpu/drm/sun4i/Makefile @@ -39,4 +39,6 @@ endif obj-$(CONFIG_DRM_SUN4I_HDMI) += sun4i-drm-hdmi.o obj-$(CONFIG_DRM_SUN6I_DSI) += sun6i-dsi.o obj-$(CONFIG_DRM_SUN8I_DW_HDMI) += sun8i-drm-hdmi.o -obj-$(CONFIG_DRM_SUN8I_MIXER) += sun8i-mixer.o sun8i_tcon_top.o +ifdef CONFIG_DRM_SUN8I_MIXER +obj-$(CONFIG_DRM_SUN4I) += sun8i-mixer.o sun8i_tcon_top.o +endif diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 6ddf4eaccb40..7551dcb34c71 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -216,7 +216,8 @@ static bool sun4i_drv_node_is_tcon_with_ch0(struct device_node *node) static bool sun4i_drv_node_is_tcon_top(struct device_node *node) { - return !!of_match_node(sun8i_tcon_top_of_table, node); + return IS_ENABLED(CONFIG_DRM_SUN8I_MIXER) && + !!of_match_node(sun8i_tcon_top_of_table, node); } static int compare_of(struct device *dev, void *data) diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c index 3459b9ec56c9..b18c8f175dba 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c @@ -44,7 +44,8 @@ sun8i_dw_hdmi_mode_valid(struct drm_connector *connector, static bool sun8i_dw_hdmi_node_is_tcon_top(struct device_node *node) { - return !!of_match_node(sun8i_tcon_top_of_table, node); + return IS_ENABLED(CONFIG_DRM_SUN8I_MIXER) && + !!of_match_node(sun8i_tcon_top_of_table, node); } static u32 sun8i_dw_hdmi_find_possible_crtcs(struct drm_device *drm, -- 2.9.0