summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c8
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 3fe119d7..16d4711f 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -126,12 +126,12 @@ int channel_gk20a_commit_va(struct channel_gk20a *c)
126} 126}
127 127
128int gk20a_channel_get_timescale_from_timeslice(struct gk20a *g, 128int gk20a_channel_get_timescale_from_timeslice(struct gk20a *g,
129 int timeslice_period, 129 unsigned int timeslice_period,
130 int *__timeslice_timeout, int *__timeslice_scale) 130 unsigned int *__timeslice_timeout, unsigned int *__timeslice_scale)
131{ 131{
132 int value = scale_ptimer(timeslice_period, 132 unsigned int value = scale_ptimer(timeslice_period,
133 ptimer_scalingfactor10x(g->ptimer_src_freq)); 133 ptimer_scalingfactor10x(g->ptimer_src_freq));
134 int shift = 0; 134 unsigned int shift = 0;
135 135
136 /* value field is 8 bits long */ 136 /* value field is 8 bits long */
137 while (value >= 1 << 8) { 137 while (value >= 1 << 8) {
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
index 596b85f3..c13b1c58 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
@@ -353,8 +353,8 @@ bool channel_gk20a_joblist_is_empty(struct channel_gk20a *c);
353 353
354int channel_gk20a_update_runlist(struct channel_gk20a *c, bool add); 354int channel_gk20a_update_runlist(struct channel_gk20a *c, bool add);
355int gk20a_channel_get_timescale_from_timeslice(struct gk20a *g, 355int gk20a_channel_get_timescale_from_timeslice(struct gk20a *g,
356 int timeslice_period, 356 unsigned int timeslice_period,
357 int *__timeslice_timeout, int *__timeslice_scale); 357 unsigned int *__timeslice_timeout, unsigned int *__timeslice_scale);
358 358
359int channel_gk20a_alloc_job(struct channel_gk20a *c, 359int channel_gk20a_alloc_job(struct channel_gk20a *c,
360 struct channel_gk20a_job **job_out); 360 struct channel_gk20a_job **job_out);