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

Commit 477fed70 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: DSI: fix perf measuring ifdefs 



DSI performance measuring code is meant to be explicitly enabled at
compile time. At some point in time the perf code was changed to be
enabled if DEBUG is defined. This is not right, so this patch fixes it.

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

drivers/video/omap2/dss/dsi.c

+5 −5
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ struct dsi_data { 
	struct dsi_isr_tables isr_tables_copy;



	int update_channel;

#ifdef DEBUG

#ifdef DSI_PERF_MEASURE

	unsigned update_bytes;

#endif
@@ -334,7 +334,7 @@ struct dsi_data { 


	u32		errors;

	spinlock_t	errors_lock;

#ifdef DEBUG

#ifdef DSI_PERF_MEASURE

	ktime_t perf_setup_time;

	ktime_t perf_start_time;

#endif
@@ -373,7 +373,7 @@ struct dsi_packet_sent_handler_data { 
	struct completion *completion;

};



#ifdef DEBUG

#ifdef DSI_PERF_MEASURE

static bool dsi_perf;

module_param(dsi_perf, bool, 0644);

#endif
@@ -497,7 +497,7 @@ u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt) 
	}

}



#ifdef DEBUG

#ifdef DSI_PERF_MEASURE

static void dsi_perf_mark_setup(struct platform_device *dsidev)

{

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -4277,7 +4277,7 @@ static int dsi_update(struct omap_dss_device *dssdev, int channel, 
	dw = dsi->timings.x_res;

	dh = dsi->timings.y_res;



#ifdef DEBUG

#ifdef DSI_PERF_MEASURE

	dsi->update_bytes = dw * dh *

		dsi_get_pixel_size(dsi->pix_fmt) / 8;

#endif