Browse Source

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 <[email protected]>
Ray Zhang 4 years ago
parent
commit
b818229a2f
1 changed files with 3 additions and 1 deletions
  1. 3 1
      msm/dsi/dsi_display.c

+ 3 - 1
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,