Merge "msm: camera: isp: Reset last flush req id as part of release" into dev/msm-4.14-camx (1ee9e09f) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/camera/cam_core/cam_context.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -527,6 +527,7 @@ int cam_context_init(struct cam_context *ctx,
		ctx->dev_name = dev_name;
		ctx->dev_id = dev_id;
		ctx->ctx_id = ctx_id;
		ctx->last_flush_req = 0;
		ctx->ctx_crm_intf = NULL;
		ctx->crm_ctx_intf = crm_node_intf;
		ctx->hw_mgr_intf = hw_mgr_intf;

+2 −3

Original line number	Diff line number	Diff line
		@@ -2096,6 +2096,7 @@ static int __cam_isp_ctx_release_hw_in_top_state(struct cam_context *ctx,
		CAM_ERR(CAM_ISP, "No hw resources acquired for this ctx");
		}

		ctx->last_flush_req = 0;
		ctx_isp->frame_id = 0;
		ctx_isp->active_req_cnt = 0;
		ctx_isp->reported_req_id = 0;
		@@ -2152,6 +2153,7 @@ static int __cam_isp_ctx_release_dev_in_top_state(struct cam_context *ctx,
		ctx->dev_hdl = -1;
		ctx->link_hdl = -1;
		ctx->ctx_crm_intf = NULL;
		ctx->last_flush_req = 0;
		ctx_isp->frame_id = 0;
		ctx_isp->active_req_cnt = 0;
		ctx_isp->reported_req_id = 0;
		@@ -2244,9 +2246,6 @@ static int __cam_isp_ctx_config_dev_in_top_state(
		goto free_req;
		}

		if (packet->header.request_id > ctx->last_flush_req)
		ctx->last_flush_req = 0;

		/* preprocess the configuration */
		memset(&cfg, 0, sizeof(cfg));
		cfg.packet = packet;