drm/msm/rd: fix msm_rd_dump_submit() prototype

Submitted by Arnd Bergmann on Nov. 27, 2017, 1:51 p.m.


Message ID 20171127135137.3375060-1-arnd@arndb.de
State New
Headers show
Series "drm/msm/rd: fix msm_rd_dump_submit() prototype" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Arnd Bergmann Nov. 27, 2017, 1:51 p.m.
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 <arnd@arndb.de>
 drivers/gpu/drm/msm/msm_drv.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

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) {}