From patchwork Mon Jan 15 16:14:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10164711 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 4B687601C0 for ; Mon, 15 Jan 2018 16:15:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AE2C21E5A for ; Mon, 15 Jan 2018 16:15:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E75828914; Mon, 15 Jan 2018 16:15:04 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C570121E5A for ; Mon, 15 Jan 2018 16:15:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755983AbeAOQPB (ORCPT ); Mon, 15 Jan 2018 11:15:01 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:61651 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753957AbeAOQO7 (ORCPT ); Mon, 15 Jan 2018 11:14:59 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lxbix-1evYh31FJj-017B6L; Mon, 15 Jan 2018 17:14:46 +0100 From: Arnd Bergmann To: Rob Clark Cc: Jordan Crouse , Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-i2c@vger.kernel.org, Wolfram Sang , Srinivas Kandagatla , Arnd Bergmann , David Airlie , Bjorn Andersson , Archit Taneja , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] drm/msm/adreno: fix nvmem related link error Date: Mon, 15 Jan 2018 17:14:05 +0100 Message-Id: <20180115161431.803248-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180115161431.803248-1-arnd@arndb.de> References: <20180115161431.803248-1-arnd@arndb.de> X-Provags-ID: V03:K0:ZtPKQ2aEagfeH9NZgUE456Rh+11KhQNqTu2obIzgc3DltfGZWyI sceVtweX9bl7Mn34CwCJm+jL6D6ByroMo6uHNKR5jsBwfY1WloPrEPwhhbaMrdg+ZgmJnwa FLgkTZOpJs7pF5bWW7z8HK0P1OGwdXYqUBoBYU4xzN6vxScGOc31oHHcVT/8cbYTi8WJ91n tAWmnl/I9qUac+Fm7Ldrw== X-UI-Out-Filterresults: notjunk:1; V01:K0:2s0AXqFgJyA=:nbdVquWCb3ua8U1qYOZOKv HFhaOkpIlNDKMOOVZqTi/4hInRji5KPTmgnQlNT2VMsSNXpujdC9K4GdxXWdq1j/Vu84D6O60 s3hia376HRMeyZDV19p4og9uSEYlf+3OfJGUiuMDzSXiM1k/S6eGSuJ1pvezMmfURR6CRV6ys M4QY8QrTwWISlSBBo6yXG1Tlr3ymIl+zwpXicAK99cV/cJUDjeOWfF4+B714bM7SPI0EVRH4t sHhj3/iw8zBv1NvP/bjMvQ9CFYotBTGQWquXsZqYvGC3jzRFLIZt4mo9KSh3er/wdZUhTVbfQ rTuq7GF/XEUO27DWVTIcw5jQuu41RgLPizIAa+nKsHAFugLE4dOhBk8tnmm1cbwK4+J1bXPbz szWaCS7hehkGGLLI4F5YnOYtDb1ke5C7wrlqmEX3xgkXVm8zPCpGf6+1BywEdCo5CGg/FDB29 PJYAJelSa0pMxg6YN+xGnh2TP+xdD0vOO8I7AaV173mpTjZCMWohqvESWOENYOVcel2azWH0e l3uPs46innJAsyLRhfaj/JUo0bxg+plJkcTyMX9B+PSbvWvkXL3j21tlz65xB/Zpczg2miBRh OM7FnDIZtxRrYM0YMWAuxjoRCfNgJF0h5kf1RIRJj8W0UGuwk2SlnqXR3zBUUnES2prhbfkd1 Cr4Ms2Zzo7V8pRDxR/7w16sw6Qe52k65zOyeP0tcKzXlzhJddAI+0D/5mVeRIgA3Rr+Lj1Xjk SJloqyAcWn85A2Iua6bIrVc6WQH8piI+Sv6h5g== Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When NVMEM is configured as a loadable module, and adreno is built-in, we get a link failure: drivers/gpu/drm/msm/adreno/a5xx_gpu.o: In function `a5xx_gpu_init': a5xx_gpu.c:(.text+0x15cc): undefined reference to `nvmem_cell_get' a5xx_gpu.c:(.text+0x15da): undefined reference to `nvmem_cell_read' a5xx_gpu.c:(.text+0x15e4): undefined reference to `nvmem_cell_put' This adds a Kconfig dependency to enforce valid configurations, when NVMEM is a loadable module, adreno now has to also be one. The code seems to deal fine with nvmem being completely disabled, it will just not set the right speed bin then, so we don't need a hard dependency. Fixes: f56d9df656c4 ("drm/msm/adreno: Read the speed bins for a5xx targets") Signed-off-by: Arnd Bergmann Reviewed-by: Jordan Crouse --- drivers/gpu/drm/msm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 99d39b2aefa6..74fb1c816da9 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -4,6 +4,7 @@ config DRM_MSM depends on DRM depends on ARCH_QCOM || (ARM && COMPILE_TEST) depends on OF && COMMON_CLK + depends on NVMEM || !NVMEM depends on MMU select QCOM_MDT_LOADER if ARCH_QCOM select REGULATOR