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

Commit e0502b1d authored by Venkat Chinta's avatar Venkat Chinta Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: isp: Fix overwriting UBWC config register 



UBWC mode config register is first read to ensure that
it is not overwritten while setting the UBWC_EN bit
to enable UBWC for bus write master.

Change-Id: Id1600429fe7958a333988ca706013f5e651d4393
Signed-off-by: default avatarVenkat Chinta <vchinta@codeaurora.org>
parent 9e875601

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c

+9 −3
Original line number Diff line number Diff line
@@ -1127,7 +1127,7 @@ static int cam_vfe_bus_release_wm(void *bus_priv, 


static int cam_vfe_bus_start_wm(struct cam_isp_resource_node *wm_res)

{

	int rc = 0;

	int rc = 0, val = 0;

	struct cam_vfe_bus_ver2_wm_resource_data   *rsrc_data =

		wm_res->res_priv;

	struct cam_vfe_bus_ver2_common_data        *common_data =
@@ -1184,7 +1184,10 @@ static int cam_vfe_bus_start_wm(struct cam_isp_resource_node *wm_res) 
				(struct

				cam_vfe_bus_ver2_reg_offset_ubwc_client *)

				rsrc_data->hw_regs->ubwc_regs;

			cam_io_w_mb(0x1, common_data->mem_base +

			val = cam_io_r_mb(common_data->mem_base +

				ubwc_regs->mode_cfg_0);

			val |= 0x1;

			cam_io_w_mb(val, common_data->mem_base +

				ubwc_regs->mode_cfg_0);

		} else if ((camera_hw_version == CAM_CPAS_TITAN_175_V100) ||

			(camera_hw_version == CAM_CPAS_TITAN_175_V101)) {
@@ -1195,7 +1198,10 @@ static int cam_vfe_bus_start_wm(struct cam_isp_resource_node *wm_res) 
				(struct

				cam_vfe_bus_ver2_reg_offset_ubwc_3_client *)

				rsrc_data->hw_regs->ubwc_regs;

			cam_io_w_mb(0x1, common_data->mem_base +

			val = cam_io_r_mb(common_data->mem_base +

				ubwc_regs->mode_cfg_0);

			val |= 0x1;

			cam_io_w_mb(val, common_data->mem_base +

				ubwc_regs->mode_cfg_0);

		} else {

			CAM_ERR(CAM_ISP, "Invalid HW version: %d",