From patchwork Wed May 27 13:31:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 187258 Delivered-To: patch@linaro.org Received: by 2002:a92:5b0a:0:0:0:0:0 with SMTP id p10csp1125366ilb; Wed, 27 May 2020 06:32:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzD9iWohcn4VtuNsYoJiny7A+M74DC8zyDeycVr90st2IznpF/3X1GLPa9JEn6alXJublB8 X-Received: by 2002:a17:90a:bc93:: with SMTP id x19mr5345897pjr.52.1590586341742; Wed, 27 May 2020 06:32:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590586341; cv=none; d=google.com; s=arc-20160816; b=yGx7rcbLR9QCC5ifYr0v60Z/9j4FCGoj3Svcx+F6nyFsz82dNVNFn8TJApN++lIAHq vXqQ8qIKyob0DscRrLCETSEoFSSKLrkQAiVmCism9840UBe2jL1KBn/AxdWeTOVbuktR tsi0J9Rk0c100L77BDS8nxpju4zYK5R6V23t1gy6zvF9iOlx9ekdKaODbGIXA+mNon6g 8H37tbHEtzGEUZMinTiBzgKPeJ7uKLUm1K/oZB6uD0BLO+miR/qE8/4T8/g+izo7YDE+ FcFdslbpZu0cFhFuEwPqCKjIS7lq3JzUp5aB8lidHZcsqpDzOFnGh5gZFP+tgXJUmPdA ZGdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :delivered-to; bh=dgGRE0lyXt/+0P+Y32HmThTCje72Eg2J4u3Wvm/DTv4=; b=KnO+RBoZzuNLA2zrFlSBEhjimsJNvjundAJwXb24wA2zAMRimPm3Cv0JwBCIE5e+ZB Xn5Nu/tKGQUlMLX8Tti/fBuFzXKBYujY0pXek6fMO7DiQXdS0IT5FwNa/Gpjeb9wuM6H j1Yi3lDakaXOTNmn6S/mhsMG17x8aKvZGuDH1V1sdyKgsJzod4IfccishLZqzWLw5jCn AiDQBCrtFdsQP5JVKL6A4Pt6yOf8FDwVK/HDrCTe34aAHrcOfvkJMRyYfWHkllBvxUPg XPQtCQ5ix1h11ZOk3V8K2c6yS/kuJCYstztGVsekO/cSK/Le/B/cEhD2nWyBiZdE5DbP vrfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id b11si2488123pfr.128.2020.05.27.06.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 06:32:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CBB686E2F3; Wed, 27 May 2020 13:32:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 99D576E2F3 for ; Wed, 27 May 2020 13:32:16 +0000 (UTC) Received: from localhost.localdomain ([149.172.98.151]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MmUDf-1jDuoj0QoT-00iQ43; Wed, 27 May 2020 15:32:00 +0200 From: Arnd Bergmann To: Eric Anholt , David Airlie , Daniel Vetter , Rob Herring , Sam Ravnborg , Linus Walleij Subject: [PATCH] drm: pl111: add CONFIG_VEXPRESS_CONFIG dependency Date: Wed, 27 May 2020 15:31:42 +0200 Message-Id: <20200527133158.462057-1-arnd@arndb.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:ldUeL/J8FW2oKcDogEl4FpPKkgKJzAP0nAa0Qp3NE/6Sp3ehAUK dkLxyyfABqgYzO9oQ2WwoarPv95MN2CkN2lCnhr63qu5mIUoJLMO5CerOu4QFzNttpk+IIg rDJVYuGto8DuSA+qtd2bymO1x+B9nhmIl0Qfu73WN1tEz9sy4XZcxiiHDgXP2E9yipr2dbJ AM6MqWeFGEXA4kTDlK8Aw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:qaVK8ksw8ZY=:+BK2LBxQSOejB4O1cySgpZ 08ntmG637DghcP7N1jm096g10EjOUZlu6PkwFCYK5P+JAowP0QLlIjdIACmQDpaRFSguSkgGZ g+7YO+Sb+cX2ICd845JNHdo29ZWe8sPDE4sQ6G3Gnvq2tMnR4kCatmrgGw6a5VgDkG2dfEeLT y0HUiMw8TpwFkZ1bXyU0vZva/NYTT+qAIS761NETu0hrP1nRu2brTkMU9oEO1gPhGvMI9GJyi rs1qLBPqEhY9ywfhIxCC/6KMU+07OM1HVm8f6b2LNhg5Rv7i2SpymSMH0sqitiMjeDrzbT1Ct lmPX7yVGJbTTrSz4NMzrsncsGHyqaY1dehwD6hmPx3fdsiPMd9KJ8ljwk4QWI1Hfg2qpottxt 8q5Xjzhj9tlkJ7QSSHd6FLUlMwXtLBW/9yaj9/pyRhw5IufW0IcvGYH+8Z/OmHrq58nz7B8rX yKpR1tjYVPPgDdbtAOQ0dhDxUnX9gF28YMx7kpm3Y/BImDJQvKzRR5gmADwq+T9vaKMcWbrqX XImlpZCXqbNTu21RYe624IM4DDI1kmtPZX27fZNrZZkamJcD2RbohaQ0rGSlvfPtEzRnzZis0 20Qxq4hHlSuGQXQs3XFgZ8WZ9UagA3iPJc/k7zjw0BG4eS3EDmZcVI/qDZ0VrzR/w9lAnLLRQ uzZo6TcYUZ/YgEHgX8G9gsMZIxs66y7Rv7qEV+TKRFKzKiOEqTJTn4t/9l+sJb5ggeD5JqTex s/WCILNzoM35lvR4Nj7cicaR77pmnGvEaZKg4i+pgvJdQw3UoFH6wn6uYfl4lYipnNFXqExwx y7jJXkJOn7qpnUBGLL+BNUYQodYiMb4NwUl4oWjigAoX1E/7dA= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher , dri-devel@lists.freedesktop.org, Arnd Bergmann , linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The vexpress_config code fails to link in some configurations: drivers/gpu/drm/pl111/pl111_versatile.o: in function `pl111_versatile_init': (.text+0x1f0): undefined reference to `devm_regmap_init_vexpress_config' Add a dependency that links to this only if the dependency is there, and prevent the configuration where the drm driver is built-in but the config is a loadable module. Fixes: 826fc86b5903 ("drm: pl111: Move VExpress setup into versatile init") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/pl111/Kconfig | 1 + drivers/gpu/drm/pl111/pl111_versatile.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.26.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel Reviewed-by: Linus Walleij diff --git a/drivers/gpu/drm/pl111/Kconfig b/drivers/gpu/drm/pl111/Kconfig index 80f6748055e3..33a005816fdd 100644 --- a/drivers/gpu/drm/pl111/Kconfig +++ b/drivers/gpu/drm/pl111/Kconfig @@ -3,6 +3,7 @@ config DRM_PL111 tristate "DRM Support for PL111 CLCD Controller" depends on DRM depends on ARM || ARM64 || COMPILE_TEST + depends on VEXPRESS_CONFIG || !VEXPRESS_CONFIG depends on COMMON_CLK select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c index 64f01a4e6767..451d74205108 100644 --- a/drivers/gpu/drm/pl111/pl111_versatile.c +++ b/drivers/gpu/drm/pl111/pl111_versatile.c @@ -476,7 +476,8 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv) versatile_clcd_type = (enum versatile_clcd)clcd_id->data; /* Versatile Express special handling */ - if (versatile_clcd_type == VEXPRESS_CLCD_V2M) { + if (IS_ENABLED(CONFIG_VEXPRESS_CONFIG) && + versatile_clcd_type == VEXPRESS_CLCD_V2M) { int ret = pl111_vexpress_clcd_init(dev, np, priv); of_node_put(np); if (ret)