Merge "msm: cvp: avoid checking read_idx again" (49c413a1) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/media/platform/msm/cvp/cvp_hfi.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -826,6 +826,9 @@ static int __read_queue(struct cvp_iface_q_info qinfo, u8 packet,
		*/
		mb();
		*pb_tx_req_is_set = 0;
		if (write_idx != queue->qhdr_write_idx) {
		queue->qhdr_rx_req = 0;
		} else {
		spin_unlock(&qinfo->hfi_lock);
		dprintk(CVP_DBG,
		"%s queue is empty, rx_req = %u, tx_req = %u, read_idx = %u\n",
		@@ -834,6 +837,7 @@ static int __read_queue(struct cvp_iface_q_info qinfo, u8 packet,
		queue->qhdr_read_idx);
		return -ENODATA;
		}
		}

		read_ptr = (u32 *)((qinfo->q_array.align_virtual_addr) +
		(read_idx << 2));
		@@ -876,7 +880,7 @@ static int __read_queue(struct cvp_iface_q_info qinfo, u8 packet,
		rc = -ENODATA;
		}

		if (read_idx != write_idx)
		if (new_read_idx != queue->qhdr_write_idx)
		queue->qhdr_rx_req = 0;
		else
		queue->qhdr_rx_req = receive_request;