From patchwork Mon Mar 13 16:43:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9621527 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 AAFDB60492 for ; Mon, 13 Mar 2017 16:44:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C750284D8 for ; Mon, 13 Mar 2017 16:44:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90CFD284ED; Mon, 13 Mar 2017 16:44:43 +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=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM 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 9A28B284D8 for ; Mon, 13 Mar 2017 16:44:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F5626E583; Mon, 13 Mar 2017 16:44:42 +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.126.187]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F4736E581; Mon, 13 Mar 2017 16:44:39 +0000 (UTC) Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0M9cAV-1cx7JZ0Gf1-00CzMp; Mon, 13 Mar 2017 17:44:30 +0100 From: Arnd Bergmann To: Rob Clark Subject: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs Date: Mon, 13 Mar 2017 17:43:48 +0100 Message-Id: <20170313164421.1090339-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:8Tuw7uF1l2gPeLNCXkCcv36/KCCEZcRWYAHZ26/YXo9QmovIpBu AArGXJuphtHfhze/0nae94VFcWiURGlLsZhHVomv+wJUuU/ZbozQ0C0rVf+c7RWRj7Zh/zR eIdlWHYY9az4goeg5886dlrqjLAGPWBg3obdNkwr7LS9VZba6t617wdqzOJK9tHthjVA7kx bPWPXdX/VqxPxndmtQb7w== X-UI-Out-Filterresults: notjunk:1; V01:K0:5KBRfZYYXHg=:fL7z9blrHmgvMaR+2+jlHq pegq+LoGphJgXp0btMQH2W4aU/0zR1I0r+6FNB1cNPYXThZS+Kk3m8pqA+dF+3JgeDLoDKUVn ydsza15F3WzWvB1j2h04AbOGOYFBWd7Fql6aMa7E/HLddd9oXft40Yu1FWskZ2RvSZ/YK8rBF lClozu2IKZVhDtDlZHJzYdvo4nkX5ohf4c3nGXs/N9eHFKmo1lyBNyM8xe1gC9hmPB0rTXb24 +cOnPkdWiAU8o21fxK1FZJYHynVAk6/nrJToX0CuDX2stAiJyMN/NzCWitjZtRtE52uElpGPA 0Q7MuzMz9abo1Ghk5PaeOVqIDm0qb/JSMtll9YzX2A8HojXYDPmZKsk7UFmGXIW7eirAZNhmA bpvs2AX3is6l8cwucDCikJ4BQblbHcsFCrFwHZUy8HkbYL+8t25fy9PiOIuTDQivXbO8RArfy +5KqYhtldv+5CfxLeGE1Ffgr6CRyzxeEOP6qUivMeNAGmFF1Xa2uWKGugJSJIxaonInebIBHb sij0RpuikRHVjVTmMX7rMhAv0qyHNwXz0/t4LL7D5MqGQhgxSlxORH/dew4sKx5bvTF1g+qrE UdQS/tOJNIXa+6IhL+Dm4HSfK3Z8gfwOfVQztfWc86K424K/6kWsc4ZlqbOVktImu5X7b0hVT Zc6qqq9xb8M0/1y1wFQzbPfI1WIWYkLKmbACf1ooU1GVg36HBUu7moofRvBWSScYHdVY= Cc: Arnd Bergmann , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, dri-devel@lists.freedesktop.org, 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 The newly added a5xx support fails to build when debugfs is diabled: drivers/gpu/drm/msm/adreno/a5xx_gpu.c:849:4: error: 'struct msm_gpu_funcs' has no member named 'show' drivers/gpu/drm/msm/adreno/a5xx_gpu.c:849:11: error: 'a5xx_show' undeclared here (not in a function); did you mean 'a5xx_irq'? This adds a missing #ifdef. Fixes: b5f103ab98c7 ("drm/msm: gpu: Add A5XX target support") Cc: stable@vger.kernel.org Signed-off-by: Arnd Bergmann --- Originally sent on Nov 30 for v4.10, but I now see this is still required on v4.11-rc2 --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index 4414cf73735d..f0c8bd74ca91 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -860,7 +860,9 @@ static const struct adreno_gpu_funcs funcs = { .idle = a5xx_idle, .irq = a5xx_irq, .destroy = a5xx_destroy, +#ifdef CONFIG_DEBUG_FS .show = a5xx_show, +#endif }, .get_timestamp = a5xx_get_timestamp, };