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

Commit 26da9896 authored by Rajeshwar Kurapaty's avatar Rajeshwar Kurapaty
Browse files

msm: vidc: Amend Q6 HFI session id entry to session list 



Add session id to the session list before sending the
APR packet to avoid race conditions in APR.

CRs-Fixed: 546384
Change-Id: I10ba5afdcbb9c1bd778049c7d39b03cba045a576
Signed-off-by: default avatarRajeshwar Kurapaty <rkurapat@codeaurora.org>
parent 321f1af6

drivers/media/platform/msm/vidc/q6_hfi.c

+14 −3
Original line number Original line Diff line number Diff line
@@ -562,17 +562,28 @@ static void *q6_hfi_session_init(void *device, u32 session_id, 
		dprintk(VIDC_ERR, "session_init: failed to create packet");

		dprintk(VIDC_ERR, "session_init: failed to create packet");

		goto err_session_init;

		goto err_session_init;

	}

	}

	/*

	 * Add session id to the list entry and then send the apr pkt.

	 * This will avoid scenarios where apr_send_pkt is taking more

	 * time and Q6 is returning an ack even before the session id

	 * gets added to the session list.

	 */

	mutex_lock(&dev->session_lock);

	list_add_tail(&new_session->list, &dev->sess_head);

	mutex_unlock(&dev->session_lock);





	rc = apr_send_pkt(dev->apr, (uint32_t *)&apr);

	rc = apr_send_pkt(dev->apr, (uint32_t *)&apr);

	if (rc != apr.hdr.pkt_size) {

	if (rc != apr.hdr.pkt_size) {

		dprintk(VIDC_ERR, "%s: apr_send_pkt failed rc: %d",

		dprintk(VIDC_ERR, "%s: apr_send_pkt failed rc: %d",

				__func__, rc);

				__func__, rc);

		/* Delete the session id as the send pkt is not successful */

		mutex_lock(&dev->session_lock);

		list_del(&new_session->list);

		mutex_unlock(&dev->session_lock);

		rc = -EBADE;

		rc = -EBADE;

		goto err_session_init;

		goto err_session_init;

	}

	}

	mutex_lock(&dev->session_lock);



	list_add_tail(&new_session->list, &dev->sess_head);

	mutex_unlock(&dev->session_lock);

	return new_session;

	return new_session;





err_session_init:

err_session_init: