From ab0fdb3833b53ca5221106bc9bc8bfd6b3c1f3cc Mon Sep 17 00:00:00 2001 From: Evoke Zhang Date: Fri, 31 May 2019 17:48:22 +0800 Subject: [PATCH] vout: add vout2 vpu_clkc init if needed [1/1] PD#TV-5428 Problem: need viu2 display support Solution: add vout2 init mode support Verify: u200 Change-Id: I1a8e0b5b448f5c6052703e59d78090992d5812bf Signed-off-by: Evoke Zhang --- drivers/amlogic/media/vout/vout_serve/vout2_serve.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/amlogic/media/vout/vout_serve/vout2_serve.c b/drivers/amlogic/media/vout/vout_serve/vout2_serve.c index eb5be2d22dcc..df9c2cd1058b 100644 --- a/drivers/amlogic/media/vout/vout_serve/vout2_serve.c +++ b/drivers/amlogic/media/vout/vout_serve/vout2_serve.c @@ -266,6 +266,18 @@ static int set_vout2_init_mode(void) else vmode = vout2_init_vmode; + if ((vmode & VMODE_MODE_BIT_MASK) < VMODE_NULL) { + if (IS_ERR_OR_NULL(vpu_clkc)) + VOUTERR("vout2: vpu_clkc\n"); + else { + if (vpu_clkc_state == 0) { + VOUTPR("vout2: enable vpu_clkc\n"); + clk_prepare_enable(vpu_clkc); + vpu_clkc_state = 1; + } + } + } + memset(local_name, 0, sizeof(local_name)); snprintf(local_name, VMODE_NAME_LEN_MAX, "%s", init_mode_str); ret = set_current_vmode2(vmode);