From patchwork Mon Aug 2 14:53:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 490358 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp1997756jas; Mon, 2 Aug 2021 07:53:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnRqZStkljTnsyGBd/m4m4+H/cmJTUOqxw0B1k6UX2FAstSxHSzBKWGadvyNw/5RIt77t3 X-Received: by 2002:a17:907:988d:: with SMTP id ja13mr16394359ejc.548.1627916009882; Mon, 02 Aug 2021 07:53:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627916009; cv=none; d=google.com; s=arc-20160816; b=foOryhYFeF7yqvSrgFRfS2zrhttwR+X5HkwrJpYu0+Q6izI4SBDtL1NfZV+JpAfH87 ROUrENQFZHm2D4gxVB/X/T4HU8DRtank/Hmq10oo5FUAI9FnQm5BE+7ttK23UpcsaSaw MmGlYGjvSqhFDlP2/vaTIAVpJzIis1tZVZ92zAcFdcld58e0MVKxXfe9TQJbHYpcsGkD ApnLALwNG4f90h9gM0u/gQO6dKzm0yVwdIvFJcWp5RPWMYAeoW7vvzD7oAUCtBegQ4Mq uLPtqF5sIsuoPgRq9b44/i/3UGzCP2Ou5fWnXmTxneu7grSE5cHRbovum/ZceQOd48W3 Z0rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=XTnxbDEJ3nJYuVDI6avgQ29hCmaj/sOwygrzOvTcY3o=; b=suXFhbndgcPembArr+VlnDGkjYTe5RofgoDPA+Vrp20TKWVKmuMqiWpzg4tXrOgmCs tU9rp9/qUoiw7kmQAECa/zfAi5HBXQ+/9woJ55md4XXc/S0nbfXh1twhd8/Qckq5oBqv pxj4ayp/HTFxyC7ubOjEe3gp6497/RUuHSfd8oUPvsZvR9DAZzOrSh/lQxlDUbrSiDc/ CFaWRcExy5WEKsc4alQWvxfbeWajb+QafWadhPal9MLXWPXmjsLCf4wUtYsj08E1IlKm RZ8CeO1HLqNySAKSAIZvPEJocDtuABthGMlQH1Nlg0VCOEqUKCz2ZZmOcFvRmnNN4ezs Cq5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=a99xmYHu; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a4si9999661eds.291.2021.08.02.07.53.29; Mon, 02 Aug 2021 07:53:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=a99xmYHu; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234621AbhHBOxi (ORCPT + 17 others); 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 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(-) -- 2.29.2 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