Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5667f5fe authored by Dhaval Patel's avatar Dhaval Patel Committed by Nirmal Abraham
Browse files

disp: msm: enable event log and disp ramdump without DEBUG_FS 



This patch allows event log and display ramdump
module compilation when DEBUG_FS config is in disabled
state.

Change-Id: Ibe1ff7d9d4a4f3c64091df757caba2450295e7ec
Signed-off-by: default avatarDhaval Patel <pdhaval@codeaurora.org>
Signed-off-by: default avatarNirmal Abraham <nabrah@codeaurora.org>
parent df61ff22

drivers/gpu/drm/msm/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -53,9 +53,8 @@ msm_drm-y := \ 
	sde/sde_hw_ad4.o \

	sde_edid_parser.o \

	sde_hdcp_1x.o \

	sde_hdcp_2x.o



msm_drm-$(CONFIG_DEBUG_FS) += sde_dbg.o \

	sde_hdcp_2x.o \

	sde_dbg.o \

	sde_dbg_evtlog.o \



msm_drm-$(CONFIG_DRM_MSM_HDMI) += hdmi/hdmi.o \

drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c

+0 −2
Original line number Diff line number Diff line
@@ -1921,7 +1921,6 @@ static struct platform_driver dsi_ctrl_driver = { 
	},

};



#if defined(CONFIG_DEBUG_FS)



void dsi_ctrl_debug_dump(u32 *entries, u32 size)

{
@@ -1943,7 +1942,6 @@ void dsi_ctrl_debug_dump(u32 *entries, u32 size) 
	mutex_unlock(&dsi_ctrl_list_lock);

}



#endif

/**

 * dsi_ctrl_get() - get a dsi_ctrl handle from an of_node

 * @of_node:    of_node of the DSI controller.

drivers/gpu/drm/msm/sde_dbg.c

+10 −1
Original line number Diff line number Diff line
@@ -4166,7 +4166,7 @@ void sde_dbg_ctrl(const char *name, ...) 
	va_end(args);

}





#ifdef CONFIG_DEBUG_FS

/*

 * sde_dbg_debugfs_open - debugfs open handler for evtlog dump

 * @inode: debugfs inode
@@ -5132,6 +5132,15 @@ int sde_dbg_debugfs_register(struct device *dev) 
	return 0;

}



#else



int sde_dbg_debugfs_register(struct device *dev)

{

	return 0;

}



#endif



static void _sde_dbg_debugfs_destroy(void)

{

}

drivers/gpu/drm/msm/sde_dbg.h

+0 −109
Original line number Diff line number Diff line
@@ -175,8 +175,6 @@ extern struct sde_dbg_evtlog *sde_dbg_base_evtlog; 
#define SDE_DBG_CTRL(...) sde_dbg_ctrl(__func__, ##__VA_ARGS__, \

		SDE_DBG_DUMP_DATA_LIMITER)



#if defined(CONFIG_DEBUG_FS)



/**

 * sde_evtlog_init - allocate a new event log object

 * Returns:	evtlog or -ERROR
@@ -373,111 +371,4 @@ 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;

}



static inline void sde_evtlog_destroy(struct sde_dbg_evtlog *evtlog)

{

}



static inline void sde_evtlog_log(struct sde_dbg_evtlog *evtlog,

		const char *name, int line, int flag, ...)

{

}



static inline void sde_evtlog_dump_all(struct sde_dbg_evtlog *evtlog)

{

}



static inline bool sde_evtlog_is_enabled(struct sde_dbg_evtlog *evtlog,

		u32 flag)

{

	return false;

}



static inline ssize_t sde_evtlog_dump_to_buffer(struct sde_dbg_evtlog *evtlog,

		char *evtlog_buf, ssize_t evtlog_buf_size,

		bool update_last_entry)

{

	return 0;

}



static inline void sde_dbg_init_dbg_buses(u32 hwversion)

{

}



static inline int sde_dbg_init(struct device *dev,

		struct sde_dbg_power_ctrl *power_ctrl)

{

	return 0;

}



static inline int sde_dbg_debugfs_register(struct device *dev)

{

	return 0;

}



static inline void sde_dbg_destroy(void)

{

}



static inline void sde_dbg_dump(enum sde_dbg_dump_context mode,

	const char *name, ...)

{

}



static inline void sde_dbg_ctrl(const char *name, ...)

{

}



static inline int sde_dbg_reg_register_base(const char *name,

		void __iomem *base, size_t max_offset)

{

	return 0;

}



static inline void sde_dbg_reg_register_dump_range(const char *base_name,

		const char *range_name, u32 offset_start, u32 offset_end,

		uint32_t xin_id)

{

}



static inline void sde_dbg_set_sde_top_offset(u32 blk_off)

{

}



static inline void sde_evtlog_set_filter(

		struct sde_dbg_evtlog *evtlog, char *filter)

{

}



static inline int sde_evtlog_get_filter(struct sde_dbg_evtlog *evtlog,

		int index, char *buf, size_t bufsz)

{

	return -EINVAL;

}



static inline void sde_rsc_debug_dump(u32 mux_sel)

{

}



static inline void dsi_ctrl_debug_dump(u32 *entries, u32 size)

{

}



#endif /* defined(CONFIG_DEBUG_FS) */





#endif /* SDE_DBG_H_ */

drivers/gpu/drm/msm/sde_rsc.c

+1 −1
Original line number Diff line number Diff line
@@ -1375,7 +1375,6 @@ int sde_rsc_client_trigger_vote(struct sde_rsc_client *caller_client, 
}

EXPORT_SYMBOL(sde_rsc_client_trigger_vote);



#if defined(CONFIG_DEBUG_FS)

void sde_rsc_debug_dump(u32 mux_sel)

{

	struct sde_rsc_priv *rsc;
@@ -1389,6 +1388,7 @@ void sde_rsc_debug_dump(u32 mux_sel) 
		rsc->hw_ops.debug_dump(rsc, mux_sel);

}



#if defined(CONFIG_DEBUG_FS)

static int _sde_debugfs_status_show(struct seq_file *s, void *data)

{

	struct sde_rsc_priv *rsc;