From: Cho KyongHo Date: Wed, 18 Jul 2018 11:28:15 +0000 (+0900) Subject: Revert "[HACK] g2d: enable self protection not to use smc call" X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c5ccc8ba6057e46f466088d2b4218503492ebf7;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Revert "[HACK] g2d: enable self protection not to use smc call" This reverts commit e72811145b3b24d9c54b0445d025ffe79139b497. Change-Id: Ia272efa0a66aad3a98778413dbf14d716ffea2d7 Signed-off-by: Cho KyongHo --- diff --git a/drivers/gpu/exynos/g2d/g2d_drv.c b/drivers/gpu/exynos/g2d/g2d_drv.c index 2698455d06fd..434817dd80b5 100644 --- a/drivers/gpu/exynos/g2d/g2d_drv.c +++ b/drivers/gpu/exynos/g2d/g2d_drv.c @@ -778,7 +778,6 @@ struct g2d_device_data { }; const struct g2d_device_data g2d_9610_data __initconst = { - .caps = G2D_DEVICE_CAPS_SELF_PROTECTION, .max_layers = G2D_MAX_IMAGES_HALF, }; diff --git a/drivers/gpu/exynos/g2d/g2d_regs.c b/drivers/gpu/exynos/g2d/g2d_regs.c index 1eecc5da30f0..7e3540c749d4 100644 --- a/drivers/gpu/exynos/g2d/g2d_regs.c +++ b/drivers/gpu/exynos/g2d/g2d_regs.c @@ -90,11 +90,10 @@ void g2d_hw_push_task(struct g2d_device *g2d_dev, struct g2d_task *task) if ((task->target.flags & G2D_LAYERFLAG_SECURE) || state) state |= 1 << 24; -#if 0 + writel_relaxed(state, g2d_dev->reg + G2D_JOBn_LAYER_SECURE_REG(task->job_id)); -#endif } writel_relaxed(G2D_JOB_HEADER_DATA(task->priority, task->job_id),