Merge "msm: sde: fix compilation when CONFIG_DEBUG_FS is disabled" (6113d28b) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/gpu/drm/msm/sde_dbg.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -368,6 +368,15 @@ void sde_rsc_debug_dump(u32 mux_sel);
		void dsi_ctrl_debug_dump(u32 *entries, u32 size);

		#else
		static inline
		int sde_dbg_reg_register_cb(const char name, void (cb)(void ), void ptr)
		{
		return 0;
		}
		static inline
		void sde_dbg_reg_unregister_cb(const char name, void (cb)(void ), void ptr)
		{
		}
		static inline struct sde_dbg_evtlog *sde_evtlog_init(void)
		{
		return NULL;

+12 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2017, 2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -41,8 +41,19 @@ enum sde_rot_dbg_evtlog_flag {
		sde_rot_evtlog_tout_handler(false, __func__, ##__VA_ARGS__, \
		SDE_ROT_EVTLOG_TOUT_DATA_LIMITER)

		#if defined(CONFIG_DEBUG_FS)
		void sde_rot_evtlog(const char *name, int line, int flag, ...);
		void sde_rot_evtlog_tout_handler(bool queue, const char *name, ...);
		#else
		static inline
		void sde_rot_evtlog(const char *name, int line, int flag, ...)
		{
		}
		static inline
		void sde_rot_evtlog_tout_handler(bool queue, const char *name, ...)
		{
		}
		#endif

		struct sde_rotator_device;