Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5af93b7 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: dsi: add missing trusted vm check"

parents 13154feb b818229a

msm/dsi/dsi_display.c

+3 −1
Original line number Diff line number Diff line
@@ -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,