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

Commit 2020ec69 authored by Shilpa Mamidi's avatar Shilpa Mamidi Committed by Gerrit - the friendly Code Review server
Browse files

msm: cpp: Changing order of setting GDSRC register 



If GDSRC is set after FW load this is causing FW timeout.
Setting this before Jump instruction to avoid timeout.

Change-Id: I8b20ae1d8ae627288f1615a6ae6480dd8105ddcb
Signed-off-by: default avatarShilpa Mamidi <shilpam@codeaurora.org>
parent a660e4d0

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

+4 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1325,6 +1325,9 @@ static int32_t cpp_load_fw(struct cpp_device *cpp_dev, char *fw_name_bin) 
		ptr_bin++;

	}

	msm_camera_io_w_mb(0x00, cpp_dev->cpp_hw_base + 0xC);

	rc = msm_cpp_update_gdscr_status(cpp_dev, true);

	if (rc < 0)

		pr_err("update cpp gdscr status failed\n");

	rc = msm_cpp_poll(cpp_dev->base, MSM_CPP_MSG_ID_OK);

	if (rc) {

		pr_err("%s:%d] poll command %x failed %d", __func__, __LINE__,
@@ -1370,10 +1373,6 @@ static int32_t cpp_load_fw(struct cpp_device *cpp_dev, char *fw_name_bin) 
			MSM_CPP_MSG_ID_JUMP_ACK, rc);

	}



	rc = msm_cpp_update_gdscr_status(cpp_dev, true);

	if (rc < 0)

		pr_err("update cpp gdscr status failed\n");



end:

	return rc;

}