summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-06-12 07:14:50 -0400
committerThierry Reding <treding@nvidia.com>2014-11-13 10:11:32 -0500
commitb40d02bf96e05851d1d16b4a75f66a9e16cfb2fb (patch)
treecf1bcf7e8762ca3de24884adc9fb46d2c65d052d /drivers/gpu/host1x
parentdb4fd5197b8c7223af9be8cd3f8d8b7239e5d06c (diff)
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.c12
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 4608257ab656..946c332c3906 100644
--- a/drivers/gpu/host1x/hw/channel_hw.c
+++ b/drivers/gpu/host1x/hw/channel_hw.c
@@ -32,6 +32,7 @@
32static void trace_write_gather(struct host1x_cdma *cdma, struct host1x_bo *bo, 32static void trace_write_gather(struct host1x_cdma *cdma, struct host1x_bo *bo,
33 u32 offset, u32 words) 33 u32 offset, u32 words)
34{ 34{
35 struct device *dev = cdma_to_channel(cdma)->dev;
35 void *mem = NULL; 36 void *mem = NULL;
36 37
37 if (host1x_debug_trace_cmdbuf) 38 if (host1x_debug_trace_cmdbuf)
@@ -44,11 +45,14 @@ static void trace_write_gather(struct host1x_cdma *cdma, struct host1x_bo *bo,
44 * of how much you can output to ftrace at once. 45 * of how much you can output to ftrace at once.
45 */ 46 */
46 for (i = 0; i < words; i += TRACE_MAX_LENGTH) { 47 for (i = 0; i < words; i += TRACE_MAX_LENGTH) {
47 trace_host1x_cdma_push_gather( 48 u32 num_words = min(words - i, TRACE_MAX_LENGTH);
48 dev_name(cdma_to_channel(cdma)->dev), 49 offset += i * sizeof(u32);
49 (u32)bo, min(words - i, TRACE_MAX_LENGTH), 50
50 offset + i * sizeof(u32), mem); 51 trace_host1x_cdma_push_gather(dev_name(dev), bo,
52 num_words, offset,
53 mem);
51 } 54 }
55
52 host1x_bo_munmap(bo, mem); 56 host1x_bo_munmap(bo, mem);
53 } 57 }
54} 58}