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

From: Daniel Vetter
Date: Tue Mar 14 2017 - 04:41:53 EST


On Mon, Mar 13, 2017 at 03:48:48PM -0400, Sean Paul wrote:
> On Mon, Mar 13, 2017 at 06:09:17PM +0000, Emil Velikov wrote:
> > On 13 March 2017 at 17:00, Rob Clark <robdclark@xxxxxxxxx> wrote:
> > > On Mon, Mar 13, 2017 at 12:43 PM, Arnd Bergmann <arnd@xxxxxxxx> 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@xxxxxxxxxxxxxxx
> > >> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> > >
> > > 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..
> > >
> > Sean sent a similar patch last week. I think he picked it (alongside
> > others) in drm-misc-fixes.
> > Haven't checked though ;-)
>
> Indeed [1]. I pushed it to drm-misc-fixes, but I don't see it there any longer.
>
> At any rate, I'm glad we got the fix merged somewhere.

Bad me has force-rebased -fixes once because I screwed up something. Sorry
about that :(
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch