diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2011-03-21 13:52:56 -0700 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2011-03-21 13:52:56 -0700 |
| commit | ef8a9681071592bed9a39731926b2cfafc15d2c0 (patch) | |
| tree | 3631c5d07ecc2e066c0c56163f58c7f42bdb327e /drivers | |
| parent | c93a3daa853cfb5c2d1b89b8db6c654c458097a1 (diff) | |
| parent | 8456f1bcf83bd6ac8eb6cf69911051ede3494174 (diff) | |
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/tegra/host/debug.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/tegra/host/debug.c b/drivers/video/tegra/host/debug.c index d533310e3999..a1be13eb063c 100644 --- a/drivers/video/tegra/host/debug.c +++ b/drivers/video/tegra/host/debug.c @@ -106,7 +106,7 @@ static void nvhost_debug_handle_word(struct seq_file *s, int *state, int *count, switch (*state) { case NVHOST_DBG_STATE_CMD: if (addr) - seq_printf(s, "%d: %08x: %08x:", channel, addr, val); + seq_printf(s, "%d: %08lx: %08x:", channel, addr, val); else seq_printf(s, "%d: %08x:", channel, val); @@ -161,7 +161,7 @@ static int nvhost_debug_show(struct seq_file *s, void *unused) u32 dmaput, dmaget, dmactrl; u32 cbstat, cbread; u32 fifostat; - u32 val, base; + u32 val, base, offset; unsigned start, end; unsigned wr_ptr, rd_ptr; int state; @@ -175,7 +175,7 @@ static int nvhost_debug_show(struct seq_file *s, void *unused) cbstat = readl(m->aperture + HOST1X_SYNC_CBSTAT(i)); seq_printf(s, "%d-%s (%d): ", i, m->channels[i].mod.name, - m->channels[i].mod.refcount); + atomic_read(&m->channels[i].mod.refcount)); if (dmactrl != 0x0 || !m->channels[i].cdma.push_buffer.mapped) { seq_printf(s, "inactive\n\n"); @@ -183,19 +183,20 @@ static int nvhost_debug_show(struct seq_file *s, void *unused) } switch (cbstat) { - case 0x00010008: + case 0x00010008: /* HOST_WAIT_SYNCPT */ seq_printf(s, "waiting on syncpt %d val %d\n", cbread >> 24, cbread & 0xffffff); break; - case 0x00010009: + case 0x00010009: /* HOST_WAIT_SYNCPT_BASE */ base = cbread >> 15 & 0xf; + offset = cbread & 0xffff; val = readl(m->aperture + HOST1X_SYNC_SYNCPT_BASE(base)) & 0xffff; - val += cbread & 0xffff; + val += offset; - seq_printf(s, "waiting on syncpt %d val %d\n", - cbread >> 24, val); + seq_printf(s, "waiting on syncpt %d val %d (base %d, offset %d)\n", + cbread >> 24, val, base, offset); break; default: @@ -210,7 +211,6 @@ static int nvhost_debug_show(struct seq_file *s, void *unused) * check if we're executing a fetch, and if so dump * it. */ if (size) { - u32 offset = dmaget - m->channels[i].cdma.push_buffer.phys; u32 map_base = phys_addr & PAGE_MASK; u32 map_size = (size * 4 + PAGE_SIZE - 1) & PAGE_MASK; u32 map_offset = phys_addr - map_base; |