Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs

Path	csiph.com!weretis.net!feeder4.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Rob Clark <robdclark@gmail.com>
Newsgroups	linux.kernel
Subject	Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs
Date	Mon, 13 Mar 2017 18:10:02 +0100
Message-ID	<tkBDQ-3Ed-15@gated-at.bofh.it> (permalink)
References	<tkBkt-3fs-15@gated-at.bofh.it>
X-Original-To	Arnd Bergmann <arnd@arndb.de>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=jr1F2jQTEwFPtsj/yezA9fwL34Do0pk1X8D7KMyTrGw=; b=HXonf/lwa5aebJgGgturkJTjfMHyJeP6GyXs3ZkTa1kkiWSAK7Awkq60BF2F7PjnXE 5GsrXAEHeoFy0o78hqfk98qK6R64eMqQf6O8pI/SXoLfEcUP/lDFrjd436R6tTuvfOpK A8URNsL2Ujj2QmVHGvjDSotXrFQlg0hXoAeODZCMmPWONkx31xWrol3ce/CxYxV9a5+y 4kL8XlHNvvjT4otZEF1JY5uX64XvHk5zGur734S3uG5BT1f0mY0+WWhLBcLN+ThhKYl9 8uoqo536rVkUnFAiHMkiCToeOxQ5Eo4zzUg7uVY6XpThtC6tB+RtOHlf5F8Xmv7piKMV n1sQ==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=jr1F2jQTEwFPtsj/yezA9fwL34Do0pk1X8D7KMyTrGw=; b=clP522UJIL0DOcSy46g832lzn49BCQbFumGpdTpNoFBpP4uDFAqRJ28l2LGID6roDy ur5QNRbgPtyJYLlu+KbO93oHJ6h/zvnrHAPwC5KeiCz5cOleAqzenP966ThxJsRu3vlL aOeNtqPixMlkx7CQ9iEz2lWfeSGLEJaVZ46j1Ms6NFyMNpN/VTprgVPfDhUbfmSzsAl4 3gn0Ws51/HUBUjutCr9P9Ik8TpTlSsuJ/rSw/LjicLkAn6cbNEkXrOKtKq0++0x75ZPy TVQLuh/M3t86Rt5x/kpcSG5x2lN/sTjSiY2MbbSZZaRy1emsfUuMPcd/Ao3oKR3g8dX3 /91w==
X-Gm-Message-State	AMke39n93NRUopi8+sgrAKkv4uoMTIlAkcr+k753/Rdt5f/bcMpCj+DhJGxoK0rbePfDgCcjOqJtx/gEbQRbMw==
X-Received	by 10.129.94.193 with SMTP id s184mr20239173ywb.102.1489424456464; Mon, 13 Mar 2017 10:00:56 -0700 (PDT)
MIME-Version	1.0
Content-Type	text/plain; charset=UTF-8
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	44
Organization	linux.* mail to news gateway
X-Original-Cc	stable <stable@vger.kernel.org>, David Airlie <airlied@linux.ie>, Jordan Crouse <jcrouse@codeaurora.org>, Eric Anholt <eric@anholt.net>, linux-arm-msm <linux-arm-msm@vger.kernel.org>, "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>, freedreno@lists.freedesktop.org, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
X-Original-Date	Mon, 13 Mar 2017 13:00:56 -0400
X-Original-Message-ID	<CAF6AEGsDXaz9+OkJyB5=TqhWXOHtr-0Ce4953hUALJUSarg4+A@mail.gmail.com>
X-Original-References	<20170313164421.1090339-1-arnd@arndb.de>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1599635

Show key headers only | View raw

On Mon, Mar 13, 2017 at 12:43 PM, Arnd Bergmann <arnd@arndb.de> 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 <arnd@arndb.de>

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
>

Thread

[RESEND PATCH] drm/msm: adreno: fix build error without debugfs Arnd Bergmann <arnd@arndb.de> - 2017-03-13 17:50 +0100
  Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs Rob Clark <robdclark@gmail.com> - 2017-03-13 18:10 +0100
    Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs Emil Velikov <emil.l.velikov@gmail.com> - 2017-03-13 19:10 +0100
      Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs Sean Paul <seanpaul@chromium.org> - 2017-03-13 20:50 +0100
        Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs Daniel Vetter <daniel@ffwll.ch> - 2017-03-14 09:50 +0100

csiph-web