* [RESEND PATCH] drm/msm: adreno: fix build error without debugfs
@ 2017-03-13 16:43 Arnd Bergmann
2017-03-13 17:00 ` Rob Clark
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2017-03-13 16:43 UTC (permalink / raw)
To: Rob Clark
Cc: Arnd Bergmann, stable, David Airlie, Jordan Crouse, Eric Anholt,
linux-arm-msm, dri-devel, freedreno, linux-kernel
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>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs
2017-03-13 16:43 [RESEND PATCH] drm/msm: adreno: fix build error without debugfs Arnd Bergmann
@ 2017-03-13 17:00 ` Rob Clark
2017-03-13 18:09 ` Emil Velikov
0 siblings, 1 reply; 5+ messages in thread
From: Rob Clark @ 2017-03-13 17:00 UTC (permalink / raw)
To: Arnd Bergmann
Cc: stable, David Airlie, Jordan Crouse, Eric Anholt, linux-arm-msm,
dri-devel, freedreno, Linux Kernel Mailing List
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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs
2017-03-13 17:00 ` Rob Clark
@ 2017-03-13 18:09 ` Emil Velikov
2017-03-13 19:48 ` Sean Paul
0 siblings, 1 reply; 5+ messages in thread
From: Emil Velikov @ 2017-03-13 18:09 UTC (permalink / raw)
To: Rob Clark
Cc: Arnd Bergmann, linux-arm-msm, Linux Kernel Mailing List,
dri-devel, stable, freedreno
On 13 March 2017 at 17:00, Rob Clark <robdclark@gmail.com> wrote:
> 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..
>
Sean sent a similar patch last week. I think he picked it (alongside
others) in drm-misc-fixes.
Haven't checked though ;-)
-Emil
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs
2017-03-13 18:09 ` Emil Velikov
@ 2017-03-13 19:48 ` Sean Paul
2017-03-14 8:41 ` Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Sean Paul @ 2017-03-13 19:48 UTC (permalink / raw)
To: Emil Velikov
Cc: Rob Clark, Arnd Bergmann, linux-arm-msm,
Linux Kernel Mailing List, dri-devel, stable, freedreno
On Mon, Mar 13, 2017 at 06:09:17PM +0000, Emil Velikov wrote:
> On 13 March 2017 at 17:00, Rob Clark <robdclark@gmail.com> wrote:
> > 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..
> >
> 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.
Sean
[1]- https://lists.freedesktop.org/archives/dri-devel/2017-March/134876.html
>
> -Emil
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RESEND PATCH] drm/msm: adreno: fix build error without debugfs
2017-03-13 19:48 ` Sean Paul
@ 2017-03-14 8:41 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2017-03-14 8:41 UTC (permalink / raw)
To: Sean Paul
Cc: Emil Velikov, Arnd Bergmann, linux-arm-msm,
Linux Kernel Mailing List, dri-devel, stable, freedreno
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@gmail.com> wrote:
> > > 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..
> > >
> > 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-03-14 8:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-13 16:43 [RESEND PATCH] drm/msm: adreno: fix build error without debugfs Arnd Bergmann
2017-03-13 17:00 ` Rob Clark
2017-03-13 18:09 ` Emil Velikov
2017-03-13 19:48 ` Sean Paul
2017-03-14 8:41 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).