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

Commit 3e3a3a1d authored by Krishnankutty Kolathappilly's avatar Krishnankutty Kolathappilly Committed by Matt Wagantall
Browse files

msm: cpp: Update bus master before initializing bandwidth manager 



The bus master flag is initialized from device tree after bandwidth
manager is initialized. This results in isp bandwidth manager to be
initialized and bus vote is set on isp side. The fix is to update
bus master before initializing bandwidth manager.

Change-Id: I6b49163657468e1a16c7aa0f351aa80090c8cc74
Signed-off-by: default avatarKrishnankutty Kolathappilly <kkolatha@codeaurora.org>
parent ff0e43ed

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+4 −4
Original line number Diff line number Diff line
@@ -3619,16 +3619,16 @@ static int cpp_probe(struct platform_device *pdev) 
		goto region_err;

	}



	rc = cpp_init_hardware(cpp_dev);

	if (rc < 0)

		goto cpp_probe_init_error;



	if (pdev->dev.of_node)

		rc = of_property_read_u32(pdev->dev.of_node, "qcom,bus-master",

			&cpp_dev->bus_master_flag);

	if (rc)

		cpp_dev->bus_master_flag = 0;



	rc = cpp_init_hardware(cpp_dev);

	if (rc < 0)

		goto cpp_probe_init_error;



	media_entity_init(&cpp_dev->msm_sd.sd.entity, 0, NULL, 0);

	cpp_dev->msm_sd.sd.entity.type = MEDIA_ENT_T_V4L2_SUBDEV;

	cpp_dev->msm_sd.sd.entity.group_id = MSM_CAMERA_SUBDEV_CPP;