diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/gr_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 8b3253a1..296d8e90 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -1121,7 +1121,7 @@ int gr_gv11b_load_stencil_default_tbl(struct gk20a *g, | |||
1121 | struct gr_gk20a *gr) | 1121 | struct gr_gk20a *gr) |
1122 | { | 1122 | { |
1123 | struct zbc_entry zbc_val; | 1123 | struct zbc_entry zbc_val; |
1124 | u32 err; | 1124 | int err; |
1125 | 1125 | ||
1126 | /* load default stencil table */ | 1126 | /* load default stencil table */ |
1127 | zbc_val.type = GV11B_ZBC_TYPE_STENCIL; | 1127 | zbc_val.type = GV11B_ZBC_TYPE_STENCIL; |
@@ -1129,23 +1129,30 @@ int gr_gv11b_load_stencil_default_tbl(struct gk20a *g, | |||
1129 | zbc_val.depth = 0x0; | 1129 | zbc_val.depth = 0x0; |
1130 | zbc_val.format = ZBC_STENCIL_CLEAR_FMT_U8; | 1130 | zbc_val.format = ZBC_STENCIL_CLEAR_FMT_U8; |
1131 | err = gr_gk20a_add_zbc(g, gr, &zbc_val); | 1131 | err = gr_gk20a_add_zbc(g, gr, &zbc_val); |
1132 | 1132 | if (err != 0) { | |
1133 | goto fail; | ||
1134 | } | ||
1133 | zbc_val.depth = 0x1; | 1135 | zbc_val.depth = 0x1; |
1134 | zbc_val.format = ZBC_STENCIL_CLEAR_FMT_U8; | 1136 | zbc_val.format = ZBC_STENCIL_CLEAR_FMT_U8; |
1135 | err |= gr_gk20a_add_zbc(g, gr, &zbc_val); | 1137 | err = gr_gk20a_add_zbc(g, gr, &zbc_val); |
1138 | if (err != 0) { | ||
1139 | goto fail; | ||
1140 | } | ||
1136 | 1141 | ||
1137 | zbc_val.depth = 0xff; | 1142 | zbc_val.depth = 0xff; |
1138 | zbc_val.format = ZBC_STENCIL_CLEAR_FMT_U8; | 1143 | zbc_val.format = ZBC_STENCIL_CLEAR_FMT_U8; |
1139 | err |= gr_gk20a_add_zbc(g, gr, &zbc_val); | 1144 | err = gr_gk20a_add_zbc(g, gr, &zbc_val); |
1140 | 1145 | if (err != 0) { | |
1141 | if (!err) { | 1146 | goto fail; |
1142 | gr->max_default_s_index = 3; | ||
1143 | } else { | ||
1144 | nvgpu_err(g, "fail to load default zbc stencil table"); | ||
1145 | return err; | ||
1146 | } | 1147 | } |
1147 | 1148 | ||
1149 | gr->max_default_s_index = 3; | ||
1150 | |||
1148 | return 0; | 1151 | return 0; |
1152 | |||
1153 | fail: | ||
1154 | nvgpu_err(g, "fail to load default zbc stencil table"); | ||
1155 | return err; | ||
1149 | } | 1156 | } |
1150 | 1157 | ||
1151 | int gr_gv11b_load_stencil_tbl(struct gk20a *g, struct gr_gk20a *gr) | 1158 | int gr_gv11b_load_stencil_tbl(struct gk20a *g, struct gr_gk20a *gr) |