diff options
Diffstat (limited to 'drivers/gpu/host1x/hw/channel_hw.c')
-rw-r--r-- | drivers/gpu/host1x/hw/channel_hw.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/hw/channel_hw.c b/drivers/gpu/host1x/hw/channel_hw.c index 946c332c3906..5e8df78b7acd 100644 --- a/drivers/gpu/host1x/hw/channel_hw.c +++ b/drivers/gpu/host1x/hw/channel_hw.c | |||
@@ -46,6 +46,7 @@ static void trace_write_gather(struct host1x_cdma *cdma, struct host1x_bo *bo, | |||
46 | */ | 46 | */ |
47 | for (i = 0; i < words; i += TRACE_MAX_LENGTH) { | 47 | for (i = 0; i < words; i += TRACE_MAX_LENGTH) { |
48 | u32 num_words = min(words - i, TRACE_MAX_LENGTH); | 48 | u32 num_words = min(words - i, TRACE_MAX_LENGTH); |
49 | |||
49 | offset += i * sizeof(u32); | 50 | offset += i * sizeof(u32); |
50 | 51 | ||
51 | trace_host1x_cdma_push_gather(dev_name(dev), bo, | 52 | trace_host1x_cdma_push_gather(dev_name(dev), bo, |
@@ -66,6 +67,7 @@ static void submit_gathers(struct host1x_job *job) | |||
66 | struct host1x_job_gather *g = &job->gathers[i]; | 67 | struct host1x_job_gather *g = &job->gathers[i]; |
67 | u32 op1 = host1x_opcode_gather(g->words); | 68 | u32 op1 = host1x_opcode_gather(g->words); |
68 | u32 op2 = g->base + g->offset; | 69 | u32 op2 = g->base + g->offset; |
70 | |||
69 | trace_write_gather(cdma, g->bo, g->offset, op1 & 0xffff); | 71 | trace_write_gather(cdma, g->bo, g->offset, op1 & 0xffff); |
70 | host1x_cdma_push(cdma, op1, op2); | 72 | host1x_cdma_push(cdma, op1, op2); |
71 | } | 73 | } |
@@ -75,7 +77,8 @@ static inline void synchronize_syncpt_base(struct host1x_job *job) | |||
75 | { | 77 | { |
76 | struct host1x *host = dev_get_drvdata(job->channel->dev->parent); | 78 | struct host1x *host = dev_get_drvdata(job->channel->dev->parent); |
77 | struct host1x_syncpt *sp = host->syncpt + job->syncpt_id; | 79 | struct host1x_syncpt *sp = host->syncpt + job->syncpt_id; |
78 | u32 id, value; | 80 | unsigned int id; |
81 | u32 value; | ||
79 | 82 | ||
80 | value = host1x_syncpt_read_max(sp); | 83 | value = host1x_syncpt_read_max(sp); |
81 | id = sp->base->id; | 84 | id = sp->base->id; |