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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,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 CD438C4338F for ; Mon, 2 Aug 2021 14:53:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACC2360FF2 for ; Mon, 2 Aug 2021 14:53:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234621AbhHBOxi (ORCPT ); Mon, 2 Aug 2021 10:53:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:52706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234525AbhHBOxh (ORCPT ); Mon, 2 Aug 2021 10:53:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2142D60F9E; Mon, 2 Aug 2021 14:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627916008; bh=iktsDM1Z7Dg9UJifRq0gxssHsMU80wtAv8bXJM+4Nig=; h=From:To:Cc:Subject:Date:From; b=a99xmYHuntKVfkrVkRyGjIvdzmAzamKe9nEuOf/TFcpC4p1sCd46pFyu9oMgGW699 WJmLTi/6ukT8rQST4IauLqB9HSM6QiDUHZKQMAy89fdKht9uLaY5fxR5IqTllDA8Zx t1odmu5RiGp0hM4mgD/bqwDRHCco7OMHcAWc1EvmdWB4nbqaHiWspzicWiweqPxo63 AX3QxwAqMd5XfsTFv9tM+a2R7XAbMzxmI93Z+g31Vrovbg/OSI2tg43ScER7WXJQub V1jw+KPPL7TsXHkq4cVziTkAE5gJPGt7xM6zxto388Bf24DGXssFztR6ha2erOYaTz 2jg6ZTRIBFw1w== From: Arnd Bergmann To: Rob Clark , Sean Paul Cc: John Stultz , Arnd Bergmann , David Airlie , Daniel Vetter , Tanmay Shah , Abhinav Kumar , Chandan Uddaraju , Georgi Djakov , Dmitry Baryshkov , Jonathan Marek , Jordan Crouse , Kees Cook , Sai Prakash Ranjan , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/msm/gpu: fix link failure with QCOM_SCM=m Date: Mon, 2 Aug 2021 16:53:00 +0200 Message-Id: <20210802145321.1153989-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Arnd Bergmann Another missed dependency when SCM is a loadable module and adreno is built-in: drivers/gpu/drm/msm/adreno/adreno_gpu.o: In function `adreno_zap_shader_load': adreno_gpu.c:(.text+0x1e8): undefined reference to `qcom_scm_is_available' drivers/gpu/drm/msm/adreno/a5xx_gpu.o: In function `a5xx_hw_init': a5xx_gpu.c:(.text+0x28a6): undefined reference to `qcom_scm_set_remote_state' Change it so the dependency on QCOM_SCM and QCOM_MDT_LOADER can be ignored if we are not building for ARCH_QCOM, but prevent the link error during compile testing when SCM is a loadable module and ARCH_QCOM is disabled. Fixes: a9e2559c931d ("drm/msm/gpu: Move zap shader loading to adreno") Fixes: 5ea4dba68305 ("drm/msm/a6xx: add CONFIG_QCOM_LLCC dependency") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 52536e7adb95..69fbfe4568b2 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -9,14 +9,14 @@ config DRM_MSM depends on QCOM_OCMEM || QCOM_OCMEM=n depends on QCOM_LLCC || QCOM_LLCC=n depends on QCOM_COMMAND_DB || QCOM_COMMAND_DB=n + depends on QCOM_SCM || (QCOM_SCM=n && ARCH_QCOM=n) + depends on QCOM_MDT_LOADER || ARCH_QCOM=n select IOMMU_IO_PGTABLE - select QCOM_MDT_LOADER if ARCH_QCOM select REGULATOR select DRM_KMS_HELPER select DRM_PANEL select SHMEM select TMPFS - select QCOM_SCM if ARCH_QCOM select WANT_DEV_COREDUMP select SND_SOC_HDMI_CODEC if SND_SOC select SYNC_FILE -- 2.29.2