From: hyesoo.yu Date: Mon, 28 Aug 2017 04:32:45 +0000 (+0900) Subject: [COMMON] g2d: set CAPTURE_IDX for every tasks X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=11f757517dc513763df4203c857ea1b0744b7a8c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] g2d: set CAPTURE_IDX for every tasks Even if it is a normal task, command list must explicitly be stated in CAPTURE_IDX that it is not a hwfc task. Change-Id: Ic2d766d4bd5bf15b2e684e90e91d602f9c65176b Signed-off-by: hyesoo.yu --- diff --git a/drivers/gpu/exynos/g2d/g2d_command.c b/drivers/gpu/exynos/g2d/g2d_command.c index 0f6cb3fb376b..a65ae54fe195 100644 --- a/drivers/gpu/exynos/g2d/g2d_command.c +++ b/drivers/gpu/exynos/g2d/g2d_command.c @@ -118,8 +118,10 @@ static void g2d_set_hwfc_commands(struct g2d_task *task) struct g2d_reg *regs = (struct g2d_reg *)page_address(task->cmd_page); regs[task->cmd_count].offset = G2D_HWFC_CAPTURE_IDX_REG; - regs[task->cmd_count].value = - G2D_HWFC_CAPTURE_HWFC_JOB | task->job_id; + regs[task->cmd_count].value = IS_HWFC(task->flags) ? + G2D_HWFC_CAPTURE_HWFC_JOB : 0; + regs[task->cmd_count].value |= task->job_id; + task->cmd_count++; } @@ -156,8 +158,7 @@ void g2d_complete_commands(struct g2d_task *task) g2d_set_taskctl_commands(task); - if (IS_HWFC(task->flags)) - g2d_set_hwfc_commands(task); + g2d_set_hwfc_commands(task); g2d_set_start_commands(task); }