[lkml]   [2017]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH] drm/msm/rd: fix msm_rd_dump_submit() prototype
A build regression has appeared in linux-4.15-rc from an API change,
in configurations without CONFIG_DEBUG_FS:

In file included from drivers/gpu/drm/msm/msm_gpu.h:24:0,
from drivers/gpu/drm/msm/msm_gpu.c:18:
drivers/gpu/drm/msm/msm_drv.h:306:20: note: expected 'struct msm_gem_submit *' but argument is of type 'struct msm_rd_state *'
static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {}
drivers/gpu/drm/msm/msm_gpu.c:295:4: error: too many arguments to function 'msm_rd_dump_submit'

This changes the prototype of the stub function the same way as the
regualar prototype.

Fixes: 998b9a588314 ("drm/msm/rd: allow adding addition msg to top of dump")
Signed-off-by: Arnd Bergmann <>
drivers/gpu/drm/msm/msm_drv.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index c646843d8822..9696f796b3c3 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -303,7 +303,8 @@ int msm_perf_debugfs_init(struct drm_minor *minor);
void msm_perf_debugfs_cleanup(struct msm_drm_private *priv);
static inline int msm_debugfs_late_init(struct drm_device *dev) { return 0; }
-static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {}
+static inline void msm_rd_dump_submit(struct msm_rd_state *rd,
+ struct msm_gem_submit *submit, const char *fmt, ...) {}
static inline void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) {}
static inline void msm_perf_debugfs_cleanup(struct msm_drm_private *priv) {}
 \ /
  Last update: 2017-11-27 14:52    [W:0.025 / U:5.652 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site