nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: rename ch_timedout to unserviceable

Browse Source 
ch_timedout is not a good variable name for broken and
unusable state of the channel. Rename ch_timedout to
unserviceable

Bug 2092051
Bug 2429295

Change-Id: I633eaff61928d5ef9836dcdc162b07e7a5e03881
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1996865
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Seema Khowala
2019-01-16 14:08:02 -08:00
committed by mobile promotions
parent 7fed0c1937
commit 2c0933de05
9 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/nvgpu/os/linux/cde.c
View File

@@ -1,7 +1,7 @@
/*
* Color decompression engine support
*
* Copyright (c) 2014-2018, NVIDIA Corporation. All rights reserved.
* Copyright (c) 2014-2019, NVIDIA Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -1274,7 +1274,7 @@ __releases(&cde_app->mutex)
nvgpu_log_info(g, "double finish cde context %p on channel %p",
cde_ctx, ch);
if (gk20a_channel_check_timedout(ch)) {
if (gk20a_channel_check_unserviceable(ch)) {
if (cde_ctx->is_temporary) {
nvgpu_warn(g,
"cde: channel had timed out"
@@ -1301,7 +1301,7 @@ __releases(&cde_app->mutex)
msecs_to_jiffies(CTX_DELETE_TIME));
}
if (!gk20a_channel_check_timedout(ch)) {
if (!gk20a_channel_check_unserviceable(ch)) {
gk20a_cde_ctx_release(cde_ctx);
}
}

12
drivers/gpu/nvgpu/os/linux/ioctl_channel.c
View File

@@ -663,7 +663,7 @@ static int gk20a_channel_wait_semaphore(struct channel_gk20a *ch,
int ret = 0;
/* do not wait if channel has timed out */
if (gk20a_channel_check_timedout(ch)) {
if (gk20a_channel_check_unserviceable(ch)) {
return -ETIMEDOUT;
}
@@ -685,7 +685,7 @@ static int gk20a_channel_wait_semaphore(struct channel_gk20a *ch,
ret = NVGPU_COND_WAIT_INTERRUPTIBLE(
&ch->semaphore_wq,
*semaphore == payload ||
gk20a_channel_check_timedout(ch),
gk20a_channel_check_unserviceable(ch),
timeout);
dma_buf_kunmap(dmabuf, offset >> PAGE_SHIFT, data);
@@ -709,7 +709,7 @@ static int gk20a_channel_wait(struct channel_gk20a *ch,
nvgpu_log_fn(g, " ");
if (gk20a_channel_check_timedout(ch)) {
if (gk20a_channel_check_unserviceable(ch)) {
return -ETIMEDOUT;
}
@@ -747,7 +747,7 @@ static int gk20a_channel_wait(struct channel_gk20a *ch,
remain = NVGPU_COND_WAIT_INTERRUPTIBLE(
&ch->notifier_wq,
notif->status == 0 ||
gk20a_channel_check_timedout(ch),
gk20a_channel_check_unserviceable(ch),
args->timeout);
if (remain == 0 && notif->status != 0) {
@@ -817,7 +817,7 @@ static int gk20a_ioctl_channel_submit_gpfifo(
profile = gk20a_fifo_profile_acquire(ch->g);
gk20a_fifo_profile_snapshot(profile, PROFILE_IOCTL_ENTRY);
if (gk20a_channel_check_timedout(ch)) {
if (gk20a_channel_check_unserviceable(ch)) {
return -ETIMEDOUT;
}
@@ -1320,7 +1320,7 @@ long gk20a_channel_ioctl(struct file *filp,
}
case NVGPU_IOCTL_CHANNEL_GET_TIMEDOUT:
((struct nvgpu_get_param_args *)buf)->value =
gk20a_channel_check_timedout(ch);
gk20a_channel_check_unserviceable(ch);
break;
case NVGPU_IOCTL_CHANNEL_ENABLE:
err = gk20a_busy(ch->g);

6
drivers/gpu/nvgpu/os/linux/ioctl_tsg.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2014-2019, NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -140,10 +140,10 @@ static int gk20a_tsg_unbind_channel_fd(struct tsg_gk20a *tsg, int ch_fd)
err = gk20a_tsg_unbind_channel(ch);
/*
* Mark the channel timedout since channel unbound from TSG
* Mark the channel unserviceable since channel unbound from TSG
* has no context of its own so it can't serve any job
*/
gk20a_channel_set_timedout(ch);
gk20a_channel_set_unserviceable(ch);
out:
gk20a_channel_put(ch);