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

Commit 1b3bcb33 authored by Chandrabhanu Mahapatra's avatar Chandrabhanu Mahapatra Committed by Tomi Valkeinen
Browse files

OMAPDSS: Create new debug config options 



The config option CONFIG_OMAP2_DSS_DEBUG_SUPPORT has been removed and replaced
with CONFIG_OMAP2_DSS_DEBUG and CONFIG_OMAP2_DSS_DEBUGFS. CONFIG_OMAP2_DSS_DEBUG
enables DEBUG flag and CONFIG_OMAP2_DSS_DEBUGFS enables creation of debugfs for
OMAPDSS. Both the config options are disabled by default and can be enabled
independently of one another as per convenience.

Signed-off-by: default avatarChandrabhanu Mahapatra <cmahapatra@ti.com>
Reviewed-by: default avatarSumit Semwal <sumit.semwal@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 7ad6623a

drivers/video/omap2/dss/Kconfig

+16 −6
Original line number Diff line number Diff line
@@ -18,16 +18,26 @@ config OMAP2_VRAM_SIZE 
	  You can also set this with "vram=<bytes>" kernel argument, or

	  in the board file.



config OMAP2_DSS_DEBUG_SUPPORT

config OMAP2_DSS_DEBUG

	bool "Debug support"

	default y

	default n

	help

	  This enables printing of debug messages. Alternatively, debug messages

	  can also be enabled by setting CONFIG_DYNAMIC_DEBUG and then setting

	  appropriate flags in <debugfs>/dynamic_debug/control.



config OMAP2_DSS_DEBUGFS

	bool "Debugfs filesystem support"

	depends on DEBUG_FS

	default n

	help

	  This enables debug messages. You need to enable printing

	  with 'debug' module parameter.

	  This enables debugfs for OMAPDSS at <debugfs>/omapdss. This enables

	  querying about clock configuration and register configuration of dss,

	  dispc, dsi, hdmi and rfbi.



config OMAP2_DSS_COLLECT_IRQ_STATS

	bool "Collect DSS IRQ statistics"

	depends on OMAP2_DSS_DEBUG_SUPPORT

	depends on OMAP2_DSS_DEBUGFS

	default n

	help

	  Collect DSS IRQ statistics, printable via debugfs.

drivers/video/omap2/dss/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,4 +8,4 @@ omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o 
omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o

omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi.o \

				    hdmi_panel.o ti_hdmi_4xxx_ip.o

ccflags-$(CONFIG_OMAP2_DSS_DEBUG_SUPPORT) += -DDEBUG
 
ccflags-$(CONFIG_OMAP2_DSS_DEBUG) += -DDEBUG

drivers/video/omap2/dss/core.c

+3 −3
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ int dss_set_min_bus_tput(struct device *dev, unsigned long tput) 
		return 0;

}



#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)

#if defined(CONFIG_OMAP2_DSS_DEBUGFS)

static int dss_debug_show(struct seq_file *s, void *unused)

{

	void (*func)(struct seq_file *) = s->private;
@@ -193,7 +193,7 @@ int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *)) 


	return 0;

}

#else /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */

#else /* CONFIG_OMAP2_DSS_DEBUGFS */

static inline int dss_initialize_debugfs(void)

{

	return 0;
@@ -205,7 +205,7 @@ int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *)) 
{

	return 0;

}

#endif /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */

#endif /* CONFIG_OMAP2_DSS_DEBUGFS */



/* PLATFORM DEVICE */

static int omap_dss_pm_notif(struct notifier_block *b, unsigned long v, void *d)

drivers/video/omap2/dss/dss.c

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ static void dss_runtime_put(void) 
}



/* DEBUGFS */

#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)

#if defined(CONFIG_OMAP2_DSS_DEBUGFS)

void dss_debug_dump_clocks(struct seq_file *s)

{

	dss_dump_clocks(s);

drivers/video/omap2/dss/dss.h

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ enum dss_hdmi_venc_clk_source_select dss_get_hdmi_venc_clk_source(void); 
const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src);

void dss_dump_clocks(struct seq_file *s);



#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)

#if defined(CONFIG_OMAP2_DSS_DEBUGFS)

void dss_debug_dump_clocks(struct seq_file *s);

#endif