From 72acd30390e34cdf0bc071dbb9960dad31450e95 Mon Sep 17 00:00:00 2001 From: Marcus Lorentzon Date: Wed, 5 Oct 2011 15:55:10 +0200 Subject: video: mcde: Fix fps logging Add debugfs support for enabling frame rate logging to dmesg and getting latest fps metric. ST-Ericsson ID: 364378 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I29ce236ef09049eee69ac2b93f28f548d75418d8 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33092 Tested-by: Marcus LORENTZON Reviewed-by: Jimmy RUBIN --- drivers/video/mcde/mcde_debugfs.c | 2 +- drivers/video/mcde/mcde_hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/video/mcde/mcde_debugfs.c b/drivers/video/mcde/mcde_debugfs.c index 0ef6cbb3715..586b1787d00 100644 --- a/drivers/video/mcde/mcde_debugfs.c +++ b/drivers/video/mcde/mcde_debugfs.c @@ -120,7 +120,7 @@ static struct channel_info *find_chnl(u8 chnl_id) static struct overlay_info *find_ovly(struct channel_info *ci, u8 ovly_id) { - if (!ci || ovly_id > MAX_NUM_OVERLAYS) + if (!ci || ovly_id >= MAX_NUM_OVERLAYS) return NULL; return &ci->overlays[ovly_id]; } diff --git a/drivers/video/mcde/mcde_hw.c b/drivers/video/mcde/mcde_hw.c index 49ecc332ab5..c9b4a9f3165 100644 --- a/drivers/video/mcde/mcde_hw.c +++ b/drivers/video/mcde/mcde_hw.c @@ -2635,7 +2635,7 @@ static void chnl_update_overlay(struct mcde_chnl_state *chnl, if (ovly->regs.dirty_buf) { update_overlay_registers_on_the_fly(ovly->idx, &ovly->regs); - mcde_debugfs_overlay_update(chnl->id, ovly->idx); + mcde_debugfs_overlay_update(chnl->id, ovly != chnl->ovly0); } if (ovly->regs.dirty) { chnl_ovly_pixel_format_apply(chnl, ovly); -- cgit v1.2.3