Merge "msm: camera: isp: Add go_cmd after rup_cmd for offline use-cases" into camera-kernel.lnx.4.0 (19198d5b) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -6355,17 +6355,6 @@ static int cam_ife_mgr_prepare_hw_update(void *hw_mgr_priv,
		}
		}

		/* add go_cmd for offline context */
		if (prepare->num_out_map_entries && prepare->num_in_map_entries &&
		ctx->is_offline) {
		rc = cam_isp_add_go_cmd(prepare, &ctx->res_list_ife_in_rd,
		ctx->base[i].idx, &kmd_buf);
		if (rc)
		CAM_ERR(CAM_ISP,
		"Add GO_CMD faled i: %d, idx: %d, rc: %d",
		i, ctx->base[i].idx, rc);
		}

		/*
		* reg update will be done later for the initial configure.
		* need to plus one to the op_code and only take the lower
		@@ -6437,6 +6426,17 @@ static int cam_ife_mgr_prepare_hw_update(void *hw_mgr_priv,
		}
		}

		/* add go_cmd for offline context */
		if (prepare->num_out_map_entries && prepare->num_in_map_entries &&
		ctx->is_offline) {
		rc = cam_isp_add_go_cmd(prepare, &ctx->res_list_ife_in_rd,
		ctx->base[i].idx, &kmd_buf);
		if (rc)
		CAM_ERR(CAM_ISP,
		"Add GO_CMD faled i: %d, idx: %d, rc: %d",
		i, ctx->base[i].idx, rc);
		}

		end:
		return rc;
		}