From patchwork Wed Jul 26 15:52:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9865355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 15441603F9 for ; Wed, 26 Jul 2017 15:54:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0138728782 for ; Wed, 26 Jul 2017 15:54:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA5DE28784; Wed, 26 Jul 2017 15:54:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3E13828783 for ; Wed, 26 Jul 2017 15:54:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0A9DC6E9A1; Wed, 26 Jul 2017 15:54:54 +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 [212.227.17.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1DDFA6E02B for ; Wed, 26 Jul 2017 15:54:51 +0000 (UTC) Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lx7w9-1dck3u2gYb-016hRL; Wed, 26 Jul 2017 17:54:27 +0200 From: Arnd Bergmann To: Rob Clark Subject: [PATCH 1/2] drm/msm: gpu: call qcom_mdt interfaces only for ARCH_QCOM Date: Wed, 26 Jul 2017 17:52:44 +0200 Message-Id: <20170726155329.581707-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:V+7x0x5wvGr8R86AKQU9OGpV00Fxp1wH05/wT1ICR8OAsmAzgdQ GSB9xmF5Qeq8Ke0jWFJ6Jl84iYOYp5pn9QjJsLGTFq/r+Al9LmSGMx6Uks7dSy+VTFfiLmw RDVXo8nrmOn6uCrmwffeKilcuxlPQJgwQoo4EmQxg/NJC4KjHNNa+tHxy41lLL8lBlhzExo DRydG8lNy1GdiISQl5j0g== X-UI-Out-Filterresults: notjunk:1; V01:K0:lkKWpVfOTeQ=:Xv+i5mh4BWI07WRFXhHS/+ xGZgtLD5XWltXWIein15GCxAwOXEapv/8gkhfHvLJnbN0NHw1DzQRz62JR8pWzZbgHUrA75bz nenNOZiVI2apWI2ispI0pwwGgRPHoHo/VEDpdl3uA45NNgLximfrmndQ3fs+BlVX3u1zG7E+/ rxCIH4ERTYsPo8i49xDcYkilod6H3W7LHC0M5Mf50OWnZtslXkqva0h7gtCMmzB2bmNEq9Rw5 3umlhczIYs/tP1vCvC+hwsCiNaj21bNIB5uwRF2cX3/O0Ow6EcuOaCiSnRyzEuxdQNGI8zEi0 LE8r6PsTu8vDTiTzftP9fvIp6pm9UuToZWODW61RImqTxBrMD8Q182FxMzIAhATTp56hRAa1S IH3xKt66Gl3LuBBzEjVqE+RB0bVpDF2vOOELSmRalsdRtyWwJsa9a9Rfg5ucFbs7VEtafuktX aQNAKhnTpNt6Mik9ECHR9I2lRQ18DHwOWo55GlwkBwMSr2Zx9RLlBN8ezKlBIptXSTfse3l6a zGdJ8m5YiK5Uq9De1cbwPKVouOzk2y5PGPoUxvvg7xzoAMOkTukfyCzBcNPLeMSa581yyoX0p ch2dTotBjRHdYMNr56+TZ/QaBdSqbQVBhFELl5IaTrILzN302OxSNpbbYdkB8HqjHHWidHqya e294dfdvhy2cDkm9MeG7qEAZXMPTUjbIDVOl53RNbcucUZu80t2y3CRKs0uCSL4I+lLyxSx5Z Ji4qf/m164LlthrbH2HEDpejDHOw4Z0gVSMyNA== Cc: Arnd Bergmann , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Bjorn Andersson , Sushmita Susheelendra , freedreno@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP When compile-testing for something other than ARCH_QCOM, we run into a link error: drivers/gpu/drm/msm/adreno/a5xx_gpu.o: In function `a5xx_hw_init': a5xx_gpu.c:(.text.a5xx_hw_init+0x600): undefined reference to `qcom_mdt_get_size' a5xx_gpu.c:(.text.a5xx_hw_init+0x93c): undefined reference to `qcom_mdt_load' There is already an #ifdef that tries to check for CONFIG_QCOM_MDT_LOADER, but that symbol is only meaningful when building for ARCH_QCOM. This adds a compile-time check for ARCH_QCOM, and clarifies the Kconfig select statement so we don't even try it for other targets. The check for CONFIG_QCOM_MDT_LOADER can then go away, which also improves compile-time coverage and makes the code a little nicer to read. Fixes: 7c65817e6d38 ("drm/msm: gpu: Enable zap shader for A5XX") Acked-by: Jordan Crouse Acked-by: Bjorn Andersson Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/Kconfig | 2 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index b638d192ce5e..99d39b2aefa6 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -5,7 +5,7 @@ config DRM_MSM depends on ARCH_QCOM || (ARM && COMPILE_TEST) depends on OF && COMMON_CLK depends on MMU - select QCOM_MDT_LOADER + select QCOM_MDT_LOADER if ARCH_QCOM select REGULATOR select DRM_KMS_HELPER select DRM_PANEL diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index b4b54f1c24bc..1d54c76a7778 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -26,8 +26,6 @@ static void a5xx_dump(struct msm_gpu *gpu); #define GPU_PAS_ID 13 -#if IS_ENABLED(CONFIG_QCOM_MDT_LOADER) - static int zap_shader_load_mdt(struct device *dev, const char *fwname) { const struct firmware *fw; @@ -36,6 +34,9 @@ static int zap_shader_load_mdt(struct device *dev, const char *fwname) void *mem_region = NULL; int ret; + if (!IS_ENABLED(CONFIG_ARCH_QCOM)) + return -EINVAL; + /* Request the MDT file for the firmware */ ret = request_firmware(&fw, fwname, dev); if (ret) { @@ -73,12 +74,6 @@ static int zap_shader_load_mdt(struct device *dev, const char *fwname) return ret; } -#else -static int zap_shader_load_mdt(struct device *dev, const char *fwname) -{ - return -ENODEV; -} -#endif static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, struct msm_file_private *ctx)