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

Commit 557a1544 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: remove dss_feat_get_clk_source_name() 



We have two functions to return a name for clock sources for debugging
purposes: dss_feat_get_clk_source_name() and
dss_get_generic_clk_source_name().

The former is supposed to return a DSS IP version specific name for the
clock source, and the latter is supposed to return a more generic name.

All this seems a bit pointless, so let's remove the former one.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent dc0352d1

drivers/gpu/drm/omapdrm/dss/dispc.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -3432,9 +3432,8 @@ static void dispc_dump_clocks_channel(struct seq_file *s, enum omap_channel chan 




	lcd_clk_src = dss_get_lcd_clk_source(channel);

	lcd_clk_src = dss_get_lcd_clk_source(channel);





	seq_printf(s, "%s clk source = %s (%s)\n", mgr_desc[channel].name,

	seq_printf(s, "%s clk source = %s\n", mgr_desc[channel].name,

		dss_get_generic_clk_source_name(lcd_clk_src),

		dss_get_generic_clk_source_name(lcd_clk_src));

		dss_feat_get_clk_source_name(lcd_clk_src));





	dispc_mgr_get_lcd_divisor(channel, &lcd, &pcd);

	dispc_mgr_get_lcd_divisor(channel, &lcd, &pcd);
@@ -3455,9 +3454,8 @@ void dispc_dump_clocks(struct seq_file *s) 




	seq_printf(s, "- DISPC -\n");

	seq_printf(s, "- DISPC -\n");





	seq_printf(s, "dispc fclk source = %s (%s)\n",

	seq_printf(s, "dispc fclk source = %s\n",

			dss_get_generic_clk_source_name(dispc_clk_src),

			dss_get_generic_clk_source_name(dispc_clk_src));

			dss_feat_get_clk_source_name(dispc_clk_src));





	seq_printf(s, "fck\t\t%-16lu\n", dispc_fclk_rate());

	seq_printf(s, "fck\t\t%-16lu\n", dispc_fclk_rate());

drivers/gpu/drm/omapdrm/dss/dsi.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -1504,7 +1504,7 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev, 
			cinfo->clkdco, cinfo->m);

			cinfo->clkdco, cinfo->m);





	seq_printf(s,	"DSI_PLL_HSDIV_DISPC (%s)\t%-16lum_dispc %u\t(%s)\n",

	seq_printf(s,	"DSI_PLL_HSDIV_DISPC (%s)\t%-16lum_dispc %u\t(%s)\n",

			dss_feat_get_clk_source_name(dsi_module == 0 ?

			dss_get_generic_clk_source_name(dsi_module == 0 ?

				OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC :

				OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC :

				OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC),

				OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC),

			cinfo->clkout[HSDIV_DISPC],

			cinfo->clkout[HSDIV_DISPC],
@@ -1513,7 +1513,7 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev, 
			"off" : "on");

			"off" : "on");





	seq_printf(s,	"DSI_PLL_HSDIV_DSI (%s)\t%-16lum_dsi %u\t(%s)\n",

	seq_printf(s,	"DSI_PLL_HSDIV_DSI (%s)\t%-16lum_dsi %u\t(%s)\n",

			dss_feat_get_clk_source_name(dsi_module == 0 ?

			dss_get_generic_clk_source_name(dsi_module == 0 ?

				OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI :

				OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI :

				OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI),

				OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI),

			cinfo->clkout[HSDIV_DSI],

			cinfo->clkout[HSDIV_DSI],
@@ -1523,9 +1523,8 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev, 




	seq_printf(s,	"- DSI%d -\n", dsi_module + 1);

	seq_printf(s,	"- DSI%d -\n", dsi_module + 1);





	seq_printf(s,	"dsi fclk source = %s (%s)\n",

	seq_printf(s,	"dsi fclk source = %s\n",

			dss_get_generic_clk_source_name(dsi_clk_src),

			dss_get_generic_clk_source_name(dsi_clk_src));

			dss_feat_get_clk_source_name(dsi_clk_src));





	seq_printf(s,	"DSI_FCLK\t%lu\n", dsi_fclk_rate(dsidev));

	seq_printf(s,	"DSI_FCLK\t%lu\n", dsi_fclk_rate(dsidev));

drivers/gpu/drm/omapdrm/dss/dss.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -360,7 +360,7 @@ const char *dss_get_generic_clk_source_name(enum dss_clk_source clk_src) 




void dss_dump_clocks(struct seq_file *s)

void dss_dump_clocks(struct seq_file *s)

{

{

	const char *fclk_name, *fclk_real_name;

	const char *fclk_name;

	unsigned long fclk_rate;

	unsigned long fclk_rate;





	if (dss_runtime_get())

	if (dss_runtime_get())
@@ -369,11 +369,10 @@ void dss_dump_clocks(struct seq_file *s) 
	seq_printf(s, "- DSS -\n");

	seq_printf(s, "- DSS -\n");





	fclk_name = dss_get_generic_clk_source_name(OMAP_DSS_CLK_SRC_FCK);

	fclk_name = dss_get_generic_clk_source_name(OMAP_DSS_CLK_SRC_FCK);

	fclk_real_name = dss_feat_get_clk_source_name(OMAP_DSS_CLK_SRC_FCK);

	fclk_rate = clk_get_rate(dss.dss_clk);

	fclk_rate = clk_get_rate(dss.dss_clk);





	seq_printf(s, "%s (%s) = %lu\n",

	seq_printf(s, "%s = %lu\n",

			fclk_name, fclk_real_name,

			fclk_name,

			fclk_rate);

			fclk_rate);





	dss_runtime_put();

	dss_runtime_put();

drivers/gpu/drm/omapdrm/dss/dss_features.c

+0 −43
Original line number Original line Diff line number Diff line
@@ -50,7 +50,6 @@ struct omap_dss_features { 
	const enum omap_dss_output_id *supported_outputs;

	const enum omap_dss_output_id *supported_outputs;

	const enum omap_color_mode *supported_color_modes;

	const enum omap_color_mode *supported_color_modes;

	const enum omap_overlay_caps *overlay_caps;

	const enum omap_overlay_caps *overlay_caps;

	const char * const *clksrc_names;

	const struct dss_param_range *dss_params;

	const struct dss_param_range *dss_params;





	const enum omap_dss_rotation_type supported_rotation_types;

	const enum omap_dss_rotation_type supported_rotation_types;
@@ -389,34 +388,6 @@ static const enum omap_overlay_caps omap4_dss_overlay_caps[] = { 
		OMAP_DSS_OVL_CAP_POS | OMAP_DSS_OVL_CAP_REPLICATION,

		OMAP_DSS_OVL_CAP_POS | OMAP_DSS_OVL_CAP_REPLICATION,

};

};





static const char * const omap2_dss_clk_source_names[] = {

	[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC]	= "N/A",

	[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI]	= "N/A",

	[OMAP_DSS_CLK_SRC_FCK]			= "DSS_FCLK1",

};



static const char * const omap3_dss_clk_source_names[] = {

	[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC]	= "DSI1_PLL_FCLK",

	[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI]	= "DSI2_PLL_FCLK",

	[OMAP_DSS_CLK_SRC_FCK]			= "DSS1_ALWON_FCLK",

};



static const char * const omap4_dss_clk_source_names[] = {

	[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC]	= "PLL1_CLK1",

	[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI]	= "PLL1_CLK2",

	[OMAP_DSS_CLK_SRC_FCK]			= "DSS_FCLK",

	[OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC]	= "PLL2_CLK1",

	[OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI]	= "PLL2_CLK2",

};



static const char * const omap5_dss_clk_source_names[] = {

	[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC]	= "DPLL_DSI1_A_CLK1",

	[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI]	= "DPLL_DSI1_A_CLK2",

	[OMAP_DSS_CLK_SRC_FCK]			= "DSS_CLK",

	[OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC]	= "DPLL_DSI1_C_CLK1",

	[OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI]	= "DPLL_DSI1_C_CLK2",

};



static const struct dss_param_range omap2_dss_param_range[] = {

static const struct dss_param_range omap2_dss_param_range[] = {

	[FEAT_PARAM_DSS_FCK]			= { 0, 133000000 },

	[FEAT_PARAM_DSS_FCK]			= { 0, 133000000 },

	[FEAT_PARAM_DSS_PCD]			= { 2, 255 },

	[FEAT_PARAM_DSS_PCD]			= { 2, 255 },
@@ -631,7 +602,6 @@ static const struct omap_dss_features omap2_dss_features = { 
	.supported_outputs = omap2_dss_supported_outputs,

	.supported_outputs = omap2_dss_supported_outputs,

	.supported_color_modes = omap2_dss_supported_color_modes,

	.supported_color_modes = omap2_dss_supported_color_modes,

	.overlay_caps = omap2_dss_overlay_caps,

	.overlay_caps = omap2_dss_overlay_caps,

	.clksrc_names = omap2_dss_clk_source_names,

	.dss_params = omap2_dss_param_range,

	.dss_params = omap2_dss_param_range,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,

	.buffer_size_unit = 1,

	.buffer_size_unit = 1,
@@ -652,7 +622,6 @@ static const struct omap_dss_features omap3430_dss_features = { 
	.supported_outputs = omap3430_dss_supported_outputs,

	.supported_outputs = omap3430_dss_supported_outputs,

	.supported_color_modes = omap3_dss_supported_color_modes,

	.supported_color_modes = omap3_dss_supported_color_modes,

	.overlay_caps = omap3430_dss_overlay_caps,

	.overlay_caps = omap3430_dss_overlay_caps,

	.clksrc_names = omap3_dss_clk_source_names,

	.dss_params = omap3_dss_param_range,

	.dss_params = omap3_dss_param_range,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,

	.buffer_size_unit = 1,

	.buffer_size_unit = 1,
@@ -676,7 +645,6 @@ static const struct omap_dss_features am35xx_dss_features = { 
	.supported_outputs = omap3430_dss_supported_outputs,

	.supported_outputs = omap3430_dss_supported_outputs,

	.supported_color_modes = omap3_dss_supported_color_modes,

	.supported_color_modes = omap3_dss_supported_color_modes,

	.overlay_caps = omap3430_dss_overlay_caps,

	.overlay_caps = omap3430_dss_overlay_caps,

	.clksrc_names = omap3_dss_clk_source_names,

	.dss_params = omap3_dss_param_range,

	.dss_params = omap3_dss_param_range,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,

	.buffer_size_unit = 1,

	.buffer_size_unit = 1,
@@ -696,7 +664,6 @@ static const struct omap_dss_features am43xx_dss_features = { 
	.supported_outputs = am43xx_dss_supported_outputs,

	.supported_outputs = am43xx_dss_supported_outputs,

	.supported_color_modes = omap3_dss_supported_color_modes,

	.supported_color_modes = omap3_dss_supported_color_modes,

	.overlay_caps = omap3430_dss_overlay_caps,

	.overlay_caps = omap3430_dss_overlay_caps,

	.clksrc_names = omap2_dss_clk_source_names,

	.dss_params = am43xx_dss_param_range,

	.dss_params = am43xx_dss_param_range,

	.supported_rotation_types = OMAP_DSS_ROT_DMA,

	.supported_rotation_types = OMAP_DSS_ROT_DMA,

	.buffer_size_unit = 1,

	.buffer_size_unit = 1,
@@ -716,7 +683,6 @@ static const struct omap_dss_features omap3630_dss_features = { 
	.supported_outputs = omap3630_dss_supported_outputs,

	.supported_outputs = omap3630_dss_supported_outputs,

	.supported_color_modes = omap3_dss_supported_color_modes,

	.supported_color_modes = omap3_dss_supported_color_modes,

	.overlay_caps = omap3630_dss_overlay_caps,

	.overlay_caps = omap3630_dss_overlay_caps,

	.clksrc_names = omap3_dss_clk_source_names,

	.dss_params = omap3_dss_param_range,

	.dss_params = omap3_dss_param_range,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,

	.buffer_size_unit = 1,

	.buffer_size_unit = 1,
@@ -738,7 +704,6 @@ static const struct omap_dss_features omap4430_es1_0_dss_features = { 
	.supported_outputs = omap4_dss_supported_outputs,

	.supported_outputs = omap4_dss_supported_outputs,

	.supported_color_modes = omap4_dss_supported_color_modes,

	.supported_color_modes = omap4_dss_supported_color_modes,

	.overlay_caps = omap4_dss_overlay_caps,

	.overlay_caps = omap4_dss_overlay_caps,

	.clksrc_names = omap4_dss_clk_source_names,

	.dss_params = omap4_dss_param_range,

	.dss_params = omap4_dss_param_range,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,

	.buffer_size_unit = 16,

	.buffer_size_unit = 16,
@@ -759,7 +724,6 @@ static const struct omap_dss_features omap4430_es2_0_1_2_dss_features = { 
	.supported_outputs = omap4_dss_supported_outputs,

	.supported_outputs = omap4_dss_supported_outputs,

	.supported_color_modes = omap4_dss_supported_color_modes,

	.supported_color_modes = omap4_dss_supported_color_modes,

	.overlay_caps = omap4_dss_overlay_caps,

	.overlay_caps = omap4_dss_overlay_caps,

	.clksrc_names = omap4_dss_clk_source_names,

	.dss_params = omap4_dss_param_range,

	.dss_params = omap4_dss_param_range,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,

	.buffer_size_unit = 16,

	.buffer_size_unit = 16,
@@ -780,7 +744,6 @@ static const struct omap_dss_features omap4_dss_features = { 
	.supported_outputs = omap4_dss_supported_outputs,

	.supported_outputs = omap4_dss_supported_outputs,

	.supported_color_modes = omap4_dss_supported_color_modes,

	.supported_color_modes = omap4_dss_supported_color_modes,

	.overlay_caps = omap4_dss_overlay_caps,

	.overlay_caps = omap4_dss_overlay_caps,

	.clksrc_names = omap4_dss_clk_source_names,

	.dss_params = omap4_dss_param_range,

	.dss_params = omap4_dss_param_range,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,

	.buffer_size_unit = 16,

	.buffer_size_unit = 16,
@@ -801,7 +764,6 @@ static const struct omap_dss_features omap5_dss_features = { 
	.supported_outputs = omap5_dss_supported_outputs,

	.supported_outputs = omap5_dss_supported_outputs,

	.supported_color_modes = omap4_dss_supported_color_modes,

	.supported_color_modes = omap4_dss_supported_color_modes,

	.overlay_caps = omap4_dss_overlay_caps,

	.overlay_caps = omap4_dss_overlay_caps,

	.clksrc_names = omap5_dss_clk_source_names,

	.dss_params = omap5_dss_param_range,

	.dss_params = omap5_dss_param_range,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,

	.supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,

	.buffer_size_unit = 16,

	.buffer_size_unit = 16,
@@ -859,11 +821,6 @@ bool dss_feat_color_mode_supported(enum omap_plane plane, 
			color_mode;

			color_mode;

}

}





const char *dss_feat_get_clk_source_name(enum dss_clk_source id)

{

	return omap_current_dss_features->clksrc_names[id];

}



u32 dss_feat_get_buffer_size_unit(void)

u32 dss_feat_get_buffer_size_unit(void)

{

{

	return omap_current_dss_features->buffer_size_unit;

	return omap_current_dss_features->buffer_size_unit;

drivers/gpu/drm/omapdrm/dss/dss_features.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,6 @@ unsigned long dss_feat_get_param_max(enum dss_range_param param); 
enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane plane);

enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane plane);

bool dss_feat_color_mode_supported(enum omap_plane plane,

bool dss_feat_color_mode_supported(enum omap_plane plane,

		enum omap_color_mode color_mode);

		enum omap_color_mode color_mode);

const char *dss_feat_get_clk_source_name(enum dss_clk_source id);





u32 dss_feat_get_buffer_size_unit(void);	/* in bytes */

u32 dss_feat_get_buffer_size_unit(void);	/* in bytes */

u32 dss_feat_get_burst_size_unit(void);		/* in bytes */

u32 dss_feat_get_burst_size_unit(void);		/* in bytes */