From d4382ed094fc831d40a229acc150f1a1349ee9f1 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Tue, 20 Feb 2018 17:50:24 -0800 Subject: gpu: nvgpu: Use asid only under CONFIG_SYNC in channel_sync_gk20a.c This variable is only ever used under the CONFIG_SYNC config so make sure that we only define/assign to it when CONFIG_SYNC is enabled. JIRA NVGPU-525 Change-Id: I27160adbd6a46f58e21f24ab19d37966ded5e7de Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1673812 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c index c6b55bf8..e896eb88 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c @@ -893,9 +893,11 @@ static void gk20a_channel_semaphore_destroy(struct gk20a_channel_sync *s) static struct gk20a_channel_sync * gk20a_channel_semaphore_create(struct channel_gk20a *c, bool user_managed) { - int asid = -1; struct gk20a_channel_semaphore *sema; char pool_name[20]; +#ifdef CONFIG_SYNC + int asid = -1; +#endif if (WARN_ON(!c->vm)) return NULL; @@ -905,13 +907,13 @@ gk20a_channel_semaphore_create(struct channel_gk20a *c, bool user_managed) return NULL; sema->c = c; - if (c->vm->as_share) - asid = c->vm->as_share->id; - sprintf(pool_name, "semaphore_pool-%d", c->chid); sema->pool = c->vm->sema_pool; #ifdef CONFIG_SYNC + if (c->vm->as_share) + asid = c->vm->as_share->id; + sema->timeline = gk20a_sync_timeline_create( "gk20a_ch%d_as%d", c->chid, asid); if (!sema->timeline) { -- cgit v1.2.2