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

Commit a581a6e1 authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Reset IFE hardware before active and wait list flush"... 

Merge "msm: camera: isp: Reset IFE hardware before active and wait list flush" into dev/msm-4.14-camx
parents 662d802b 84f880ac

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c

+8 −8
Original line number Diff line number Diff line
@@ -2097,6 +2097,14 @@ static int __cam_isp_ctx_flush_req_in_top_state( 
		ctx->hw_mgr_intf->hw_stop(ctx->hw_mgr_intf->hw_mgr_priv,

				&stop_args);



		CAM_DBG(CAM_ISP, "try to reset hw");

		/* Reset hw */

		reset_args.ctxt_to_hw_map = ctx_isp->hw_ctx;

		rc = ctx->hw_mgr_intf->hw_reset(ctx->hw_mgr_intf->hw_mgr_priv,

			&reset_args);

		if (rc)

			goto end;



		spin_lock_bh(&ctx->lock);

		CAM_DBG(CAM_ISP, "try to flush wait list");

		rc = __cam_isp_ctx_flush_req(ctx, &ctx->wait_req_list,
@@ -2107,14 +2115,6 @@ static int __cam_isp_ctx_flush_req_in_top_state( 
		ctx_isp->active_req_cnt = 0;

		spin_unlock_bh(&ctx->lock);



		CAM_DBG(CAM_ISP, "try to reset hw");

		/* Reset hw */

		reset_args.ctxt_to_hw_map = ctx_isp->hw_ctx;

		rc = ctx->hw_mgr_intf->hw_reset(ctx->hw_mgr_intf->hw_mgr_priv,

			&reset_args);

		if (rc)

			goto end;



		CAM_DBG(CAM_ISP, "ctx id%d try to start hw", ctx->ctx_id);

		/* Start hw */

		start_isp.hw_config.ctxt_to_hw_map = ctx_isp->hw_ctx;