From 5ea7ab10ecddc6d6f8d9c72ea6e60ba260389c63 Mon Sep 17 00:00:00 2001 From: Wei Sun Date: Mon, 7 Jul 2014 15:19:29 -0700 Subject: gpu: nvgpu: gm20b: fix CBC clear gm20b_ltc_cbc_ctrl sent the wrong register value to clear the CBC. Bug 1507804 Change-Id: Ib0d867a122466e50cb15fef3b320fb2ee8455ef2 Signed-off-by: Wei Sun Reviewed-on: http://git-master/r/435297 Reviewed-by: Kevin Huang (Eng-SW) Tested-by: Kevin Huang (Eng-SW) Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Yu-Huan Hsu --- drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index b9c3b32d..e3c003a6 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c @@ -131,7 +131,7 @@ static int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, BUG_ON(1); } gk20a_writel(g, ltc_ltcs_ltss_cbc_ctrl1_r(), - gk20a_readl(g, ltc_ltcs_ltss_cbc_ctrl1_r()) || hw_op); + gk20a_readl(g, ltc_ltcs_ltss_cbc_ctrl1_r()) | hw_op); for (ltc = 0; ltc < g->ltc_count; ltc++) { for (slice = 0; slice < slices_per_ltc; slice++) { -- cgit v1.2.2