From b818229a2fe105931bfa9b4e466666345ede20ab Mon Sep 17 00:00:00 2001 From: Ray Zhang Date: Fri, 18 Sep 2020 10:21:36 +0800 Subject: [PATCH] disp: msm: dsi: add missing trusted vm check Need to check trusted VM environment when loading DSI firmware. Add this missing check due to propagation issue. Change-Id: I7c84b487a58133df49ba23e80e6b6ff8783cdf6c Signed-off-by: Ray Zhang --- msm/dsi/dsi_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c index 3c3e962d..abed60e4 100644 --- a/msm/dsi/dsi_display.c +++ b/msm/dsi/dsi_display.c @@ -5780,7 +5780,9 @@ int dsi_display_dev_probe(struct platform_device *pdev) platform_set_drvdata(pdev, display); /* initialize display in firmware callback */ - if (!boot_disp->boot_disp_en && IS_ENABLED(CONFIG_DSI_PARSER)) { + if (!boot_disp->boot_disp_en && + IS_ENABLED(CONFIG_DSI_PARSER) && + !display->trusted_vm_env) { firm_req = !request_firmware_nowait( THIS_MODULE, 1, "dsi_prop", &pdev->dev, GFP_KERNEL, display,