From patchwork Sun Jan 3 14:03:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 356153 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp14273297jai; Sun, 3 Jan 2021 06:04:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJygtmvlmDi6gj3DMyS7yrfifNS4/cfSwhX4u0hGLY5bTb0r7lJokijuVtWcQvq+1xaF8e7f X-Received: by 2002:a17:90b:4b87:: with SMTP id lr7mr25675845pjb.40.1609682653995; Sun, 03 Jan 2021 06:04:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609682653; cv=none; d=google.com; s=arc-20160816; b=rfdetiZKmtnFlr60lv/JHKX/FO35c16uwhnq+3N5mGv8ESyi7SW1DGRvtIBLlqgpMp 0ausfbpFNdQw+EOIUOcifMQsbWzxKiBFv8EhB38+Ge8Y7wzTcr8yyC96cuwpj1f+B7P8 iZ8BH3W08bLjVcxE5A6eIZWGh7RiY8foyr0lplNgazmGMvKjZJa+guRM9IjbhWSBeFfa jmMCYUkpf1ay5Uzj3bwSFO8S9fPFcUDc3UDsWsCDP+z3rnSFyjJe1Boy+5WHKXLv18nc ZR9dYztmI7KzyR+KmA6gYm4acMfGkgEOjkNqjJ7iZ89hr+Q8g39H9hctvQULqkFHgovu 4s0w== 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 :dkim-signature:delivered-to; bh=msxXmwY1NV0DBt1j0LC/6/L0kG6scehRn80rHQW2/y8=; b=JcD7NjA27dq34m/YhfSJeTQsdtlAuxU8JKBusJUewR2k1gpymUbrEunmayX0y0DMLu 5O7JGC2F0r2UM1Dt3ym1Qrp/AybQ7bBQjBWVnjxQtzUAv7JdtOogV66CYP5k4Y0JkxBE IbdLYqJN2c1+/LiM6WVGj1FZ8lSDZdSh//dttsX+SVPBoNWnTLdEHyW38OTI1jxRrd/r rLdfxLS53DUye/oDuXnLH/2NhZsam2HX8qTxhYiPSU5LcSaZAo1pcHuAc3sONczwLaAD cYTyn+kHpXaxUeM30a+cXv08TedbS4hgx1xDEm9eLTXzt9S++JyJnJZsl8S3Lb9YGk8Y 74WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=k20201202 header.b=RZUXyJwU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.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 e4si53762072pgb.88.2021.01.03.06.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 06:04:13 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=k20201202 header.b=RZUXyJwU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F3B41899E7; Sun, 3 Jan 2021 14:04:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 39E0A899E7; Sun, 3 Jan 2021 14:04:12 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 482862080D; Sun, 3 Jan 2021 14:04:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609682652; bh=Ey75tATsrR5FQShYsC5Hg0ZFtsB2bV+9NEouqmN89Mk=; h=From:To:Cc:Subject:Date:From; b=RZUXyJwUA7NZie53rvyZdBbLFeSOxzKQZcfBmOgFC1JdnjSEuG7vVqfXdibnm8r22 /i4uB58bksBlp/Akb0hPM9PREYz7jCCpie9NAm7Knm7LpxUfIEGOnWCtoX3wJjqMSL k98kEZKTBsncR8Mpt0Me0o9xfr5GvtV2QtBB6P1NMuIsS7ik144KP4OhQzQnqk9AkR KsGCNEiv0YFb37qFQi1EDWX6kzGT3PP+ACn6oHR5g7ZgujyS5cHIkZb7jibkR5FLKk M/bQ9lB4ysFAm8rxLl/uQ0DQvr/O47V194vJp3jiIFwcLwiy9zfzT1wTZBxUB4B84h ihgqW17Saqxrw== From: Arnd Bergmann To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Sharat Masetty , Sai Prakash Ranjan Subject: [PATCH] drm/msm/a6xx: add CONFIG_QCOM_LLCC dependency Date: Sun, 3 Jan 2021 15:03:45 +0100 Message-Id: <20210103140407.3917405-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 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: Arnd Bergmann , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Tanmay Shah , dri-devel@lists.freedesktop.org, Vara Reddy , freedreno@lists.freedesktop.org, Georgi Djakov , Chandan Uddaraju Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann When LLCC support is in a loadable module, the adreno support cannot be built-in: aarch64-linux-ld: drivers/gpu/drm/msm/adreno/a6xx_gpu.o: in function `a6xx_gpu_init': a6xx_gpu.c:(.text+0xe0): undefined reference to `llcc_slice_getd' a6xx_gpu.c:(.text+0xe0): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `llcc_slice_getd' aarch64-linux-ld: a6xx_gpu.c:(.text+0xec): undefined reference to `llcc_slice_getd' a6xx_gpu.c:(.text+0xec): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `llcc_slice_getd' aarch64-linux-ld: drivers/gpu/drm/msm/adreno/a6xx_gpu.o: in function `a6xx_destroy': a6xx_gpu.c:(.text+0x274): undefined reference to `llcc_slice_putd' a6xx_gpu.c:(.text+0x274): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `llcc_slice_putd' aarch64-linux-ld: a6xx_gpu.c:(.text+0x27c): undefined reference to `llcc_slice_putd' Add a Kconfig dependency that disallows the broken configuration but allows all working ones. Fixes: 474dadb8b0d5 ("drm/msm/a6xx: Add support for using system cache(LLC)") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.29.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index dabb4a1ccdcf..b8e02859fd92 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -7,6 +7,8 @@ config DRM_MSM depends on IOMMU_SUPPORT depends on OF && COMMON_CLK depends on QCOM_OCMEM || QCOM_OCMEM=n + depends on QCOM_LLCC || QCOM_LLCC=n + depends on QCOM_COMMAND_DB || QCOM_COMMAND_DB=n select IOMMU_IO_PGTABLE select QCOM_MDT_LOADER if ARCH_QCOM select REGULATOR @@ -15,7 +17,6 @@ config DRM_MSM select SHMEM select TMPFS select QCOM_SCM if ARCH_QCOM - select QCOM_COMMAND_DB if ARCH_QCOM select WANT_DEV_COREDUMP select SND_SOC_HDMI_CODEC if SND_SOC select SYNC_FILE