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, };
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
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
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
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
dri-devel@lists.freedesktop.org
-
Arnd Bergmann -
Daniel Vetter -
Emil Velikov -
Rob Clark -
Sean Paul