Merge "msm: camera: reqmgr: Fix frame skip condition" into dev/msm-4.14-camx (9d664985) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_core.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -890,7 +890,6 @@ static int __cam_req_mgr_check_sync_req_is_ready(
	CAM_DBG(CAM_CRM,		CAM_DBG(CAM_CRM,
	"Req: %lld [other link] not next req to be applied on link: %x",		"Req: %lld [other link] not next req to be applied on link: %x",
	req_id, sync_link->link_hdl);		req_id, sync_link->link_hdl);
	link->sync_link_sof_skip = true;
	return -EAGAIN;		return -EAGAIN;
	}		}

	@@ -1036,6 +1035,9 @@ static int __cam_req_mgr_process_req(struct cam_req_mgr_core_link *link,
	}		}
	spin_unlock_bh(&link->link_state_spin_lock);		spin_unlock_bh(&link->link_state_spin_lock);

			if (link->sync_link_sof_skip)
			link->sync_link_sof_skip = false;

	if (link->trigger_mask == link->subscribe_event) {		if (link->trigger_mask == link->subscribe_event) {
	slot->status = CRM_SLOT_STATUS_REQ_APPLIED;		slot->status = CRM_SLOT_STATUS_REQ_APPLIED;
	link->trigger_mask = 0;		link->trigger_mask = 0;