Merge "msm: camera: isp: Delay the change in BW during stop" into dev/msm-4.14-camx (5d64963b) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+10 −8

Original line number	Diff line number	Diff line
		@@ -2225,13 +2225,6 @@ static int cam_ife_mgr_stop_hw(void hw_mgr_priv, void stop_hw_args)
		CAM_ERR(CAM_ISP, "CDM stream off failed %d",
		ctx->cdm_handle);

		CAM_DBG(CAM_ISP, "Going to stop IFE Mux");

		/* IFE mux in resources */
		list_for_each_entry(hw_mgr_res, &ctx->res_list_ife_src, list) {
		cam_ife_hw_mgr_stop_hw_res(hw_mgr_res);
		}

		CAM_DBG(CAM_ISP, "Going to stop IFE Out");

		/* IFE out resources */
		@@ -2245,6 +2238,13 @@ static int cam_ife_mgr_stop_hw(void hw_mgr_priv, void stop_hw_args)
		}
		}

		CAM_DBG(CAM_ISP, "Going to stop IFE Mux");

		/* IFE mux in resources */
		list_for_each_entry(hw_mgr_res, &ctx->res_list_ife_src, list) {
		cam_ife_hw_mgr_stop_hw_res(hw_mgr_res);
		}

		cam_tasklet_stop(ctx->common.tasklet_info);

		/*
		@@ -2286,6 +2286,8 @@ static int cam_ife_mgr_stop_hw(void hw_mgr_priv, void stop_hw_args)
		ctx->base[i].idx, csid_halt_type);
		}

		cam_ife_mgr_pause_hw(ctx);

		if (stop_isp->stop_only)
		goto end;

+0 −21

Original line number	Diff line number	Diff line
		@@ -598,27 +598,6 @@ int cam_vfe_top_stop(void *device_priv,
		break;
		}
		}

		if (hw_info->hw_state == CAM_HW_STATE_POWER_UP) {
		rc = cam_vfe_top_set_hw_clk_rate(top_priv);
		if (rc) {
		CAM_ERR(CAM_ISP,
		"set_hw_clk_rate failed, rc=%d", rc);
		return rc;
		}

		top_priv->hw_clk_rate = 0;

		rc = cam_vfe_top_set_axi_bw_vote(top_priv, true);
		if (rc) {
		CAM_ERR(CAM_ISP,
		"set_axi_bw_vote failed, rc=%d", rc);
		return rc;
		}
		} else {
		CAM_ERR(CAM_ISP, "VFE HW not powered up");
		rc = -EPERM;
		}
		}

		return rc;