Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753629AbdCMRB2 (ORCPT ); Mon, 13 Mar 2017 13:01:28 -0400 Received: from mail-yw0-f196.google.com ([209.85.161.196]:34640 "EHLO mail-yw0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752017AbdCMRBT (ORCPT ); Mon, 13 Mar 2017 13:01:19 -0400 MIME-Version: 1.0 In-Reply-To: <20170313164421.1090339-1-arnd@arndb.de> References: <20170313164421.1090339-1-arnd@arndb.de> From: Rob Clark Date: Mon, 13 Mar 2017 13:00:56 -0400 Message-ID: Subject: Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs To: Arnd Bergmann Cc: stable , David Airlie , Jordan Crouse , Eric Anholt , linux-arm-msm , "dri-devel@lists.freedesktop.org" , freedreno@lists.freedesktop.org, Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1523 Lines: 44 On Mon, Mar 13, 2017 at 12:43 PM, Arnd Bergmann wrote: > 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 I thought I had picked this one up already, but I guess my brain was playing tricks on me.. I've pushed this to msm-next for now and will cherry-pick this over to a -fixes branch when I send fixes for 4.11.. BR, -R > --- > 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, > }; > -- > 2.9.0 >