nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-25 02:52:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: gp10b: make pending chid a u32

Browse Source 
The channel ID is typically unsigned, so change the
cilp_preempt_pending_chid from an int to a u32.

JIRA NVGPU-1008

Change-Id: I773dac22c61903aafb311f43b19dfd08d4983eea
Signed-off-by: Philip Elcan <pelcan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2011683
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Philip Elcan
2019-01-30 16:12:33 -05:00
committed by mobile promotions
parent 08ec580cd0
commit cb5f9fd59f
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/gk20a/gr_gk20a.h
View File

@@ -323,7 +323,7 @@ struct gr_gk20a {
u32 fecs_feature_override_ecc_val;
int cilp_preempt_pending_chid;
u32 cilp_preempt_pending_chid;
u32 fbp_en_mask;
u32 *fbp_rop_l2_en_mask;

13
drivers/gpu/nvgpu/gp10b/gr_gp10b.c
View File

@@ -1708,7 +1708,7 @@ static int gr_gp10b_clear_cilp_preempt_pending(struct gk20a *g,
}
gr_ctx->cilp_preempt_pending = false;
g->gr.cilp_preempt_pending_chid = -1;
g->gr.cilp_preempt_pending_chid = FIFO_INVAL_CHANNEL_ID;
return 0;
}
@@ -1829,15 +1829,18 @@ int gr_gp10b_pre_process_sm_exception(struct gk20a *g,
return 0;
}
static int gr_gp10b_get_cilp_preempt_pending_chid(struct gk20a *g, int *__chid)
static int gr_gp10b_get_cilp_preempt_pending_chid(struct gk20a *g, u32 *__chid)
{
struct nvgpu_gr_ctx *gr_ctx;
struct channel_gk20a *ch;
struct tsg_gk20a *tsg;
int chid;
u32 chid;
int ret = -EINVAL;
chid = g->gr.cilp_preempt_pending_chid;
if (chid == FIFO_INVAL_CHANNEL_ID) {
return ret;
}
ch = gk20a_channel_from_id(g, chid);
if (ch == NULL) {
@@ -1868,7 +1871,7 @@ int gr_gp10b_handle_fecs_error(struct gk20a *g,
{
u32 gr_fecs_intr = gk20a_readl(g, gr_fecs_host_int_status_r());
struct channel_gk20a *ch;
int chid = -1;
u32 chid = FIFO_INVAL_CHANNEL_ID;
int ret = 0;
struct tsg_gk20a *tsg;
@@ -1888,7 +1891,7 @@ int gr_gp10b_handle_fecs_error(struct gk20a *g,
gr_fecs_host_int_clear_ctxsw_intr1_clear_f());
ret = gr_gp10b_get_cilp_preempt_pending_chid(g, &chid);
if (ret != 0) {
if ((ret != 0) || (chid == FIFO_INVAL_CHANNEL_ID)) {
goto clean_up;
}