diff options
author | Thierry Reding <treding@nvidia.com> | 2014-06-12 13:14:50 +0200 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2014-11-13 16:11:32 +0100 |
commit | b40d02bf96e05851d1d16b4a75f66a9e16cfb2fb (patch) | |
tree | cf1bcf7e8762ca3de24884adc9fb46d2c65d052d /drivers/gpu/host1x | |
parent | db4fd5197b8c7223af9be8cd3f8d8b7239e5d06c (diff) | |
download | op-kernel-dev-b40d02bf96e05851d1d16b4a75f66a9e16cfb2fb.zip op-kernel-dev-b40d02bf96e05851d1d16b4a75f66a9e16cfb2fb.tar.gz |
gpu: host1x: Use struct host1x_bo pointers in traces
Rather than cast to a u32 use the struct host1x_bo pointers directly.
This avoid annoying warnings for 64-bit builds.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/host1x')
-rw-r--r-- | drivers/gpu/host1x/hw/channel_hw.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/host1x/hw/channel_hw.c b/drivers/gpu/host1x/hw/channel_hw.c index 4608257..946c332 100644 --- a/drivers/gpu/host1x/hw/channel_hw.c +++ b/drivers/gpu/host1x/hw/channel_hw.c @@ -32,6 +32,7 @@ static void trace_write_gather(struct host1x_cdma *cdma, struct host1x_bo *bo, u32 offset, u32 words) { + struct device *dev = cdma_to_channel(cdma)->dev; void *mem = NULL; if (host1x_debug_trace_cmdbuf) @@ -44,11 +45,14 @@ static void trace_write_gather(struct host1x_cdma *cdma, struct host1x_bo *bo, * of how much you can output to ftrace at once. */ for (i = 0; i < words; i += TRACE_MAX_LENGTH) { - trace_host1x_cdma_push_gather( - dev_name(cdma_to_channel(cdma)->dev), - (u32)bo, min(words - i, TRACE_MAX_LENGTH), - offset + i * sizeof(u32), mem); + u32 num_words = min(words - i, TRACE_MAX_LENGTH); + offset += i * sizeof(u32); + + trace_host1x_cdma_push_gather(dev_name(dev), bo, + num_words, offset, + mem); } + host1x_bo_munmap(bo, mem); } } |