aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-10-02 07:41:24 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-10-29 07:27:06 -0400
commit477fed70295dd7597b258cd509abac56c2081527 (patch)
tree4ea1aae28ee5a39130b99261beb7d2ad6ad86505 /drivers/video/omap2
parent31b6780c15a4e3a90fe260e977f5186772ce7afb (diff)
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: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r--drivers/video/omap2/dss/dsi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index a598b5812285..64b1a81b3afc 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -312,7 +312,7 @@ struct dsi_data {
312 struct dsi_isr_tables isr_tables_copy; 312 struct dsi_isr_tables isr_tables_copy;
313 313
314 int update_channel; 314 int update_channel;
315#ifdef DEBUG 315#ifdef DSI_PERF_MEASURE
316 unsigned update_bytes; 316 unsigned update_bytes;
317#endif 317#endif
318 318
@@ -334,7 +334,7 @@ struct dsi_data {
334 334
335 u32 errors; 335 u32 errors;
336 spinlock_t errors_lock; 336 spinlock_t errors_lock;
337#ifdef DEBUG 337#ifdef DSI_PERF_MEASURE
338 ktime_t perf_setup_time; 338 ktime_t perf_setup_time;
339 ktime_t perf_start_time; 339 ktime_t perf_start_time;
340#endif 340#endif
@@ -373,7 +373,7 @@ struct dsi_packet_sent_handler_data {
373 struct completion *completion; 373 struct completion *completion;
374}; 374};
375 375
376#ifdef DEBUG 376#ifdef DSI_PERF_MEASURE
377static bool dsi_perf; 377static bool dsi_perf;
378module_param(dsi_perf, bool, 0644); 378module_param(dsi_perf, bool, 0644);
379#endif 379#endif
@@ -497,7 +497,7 @@ u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt)
497 } 497 }
498} 498}
499 499
500#ifdef DEBUG 500#ifdef DSI_PERF_MEASURE
501static void dsi_perf_mark_setup(struct platform_device *dsidev) 501static void dsi_perf_mark_setup(struct platform_device *dsidev)
502{ 502{
503 struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev); 503 struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -4277,7 +4277,7 @@ static int dsi_update(struct omap_dss_device *dssdev, int channel,
4277 dw = dsi->timings.x_res; 4277 dw = dsi->timings.x_res;
4278 dh = dsi->timings.y_res; 4278 dh = dsi->timings.y_res;
4279 4279
4280#ifdef DEBUG 4280#ifdef DSI_PERF_MEASURE
4281 dsi->update_bytes = dw * dh * 4281 dsi->update_bytes = dw * dh *
4282 dsi_get_pixel_size(dsi->pix_fmt) / 8; 4282 dsi_get_pixel_size(dsi->pix_fmt) / 8;
4283#endif 4283#endif