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

Commit 9d147ca1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: remove additional checks in response_handler"

parents 0e20c3a7 056eb4a2

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

+1 −30
Original line number Diff line number Diff line
@@ -1850,34 +1850,6 @@ static int venus_hfi_core_release(void *dev) 
	return rc;

}



static int __get_q_size(struct venus_hfi_device *dev, unsigned int q_index)

{

	struct hfi_queue_header *queue;

	struct vidc_iface_q_info *q_info;

	u32 write_ptr, read_ptr;



	if (q_index >= VIDC_IFACEQ_NUMQ) {

		dprintk(VIDC_ERR, "Invalid q index: %d\n", q_index);

		return -ENOENT;

	}



	q_info = &dev->iface_queues[q_index];

	if (!q_info) {

		dprintk(VIDC_ERR, "cannot read shared Q's\n");

		return -ENOENT;

	}



	queue = (struct hfi_queue_header *)q_info->q_hdr;

	if (!queue) {

		dprintk(VIDC_ERR, "queue not present\n");

		return -ENOENT;

	}



	write_ptr = (u32)queue->qhdr_write_idx;

	read_ptr = (u32)queue->qhdr_read_idx;

	return read_ptr - write_ptr;

}



static void __core_clear_interrupt(struct venus_hfi_device *device)

{

	u32 intr_status = 0;
@@ -3206,8 +3178,7 @@ static int __response_handler(struct venus_hfi_device *device) 
			*session_id = session->session_id;

		}



		if (packet_count >= max_packets &&

				__get_q_size(device, VIDC_IFACEQ_MSGQ_IDX)) {

		if (packet_count >= max_packets) {

			dprintk(VIDC_WARN,

					"Too many packets in message queue to handle at once, deferring read\n");

			break;

drivers/media/platform/msm/vidc_3x/venus_hfi.c

+1 −30
Original line number Diff line number Diff line
@@ -2289,34 +2289,6 @@ static int venus_hfi_core_release(void *dev) 
	return rc;

}



static int __get_q_size(struct venus_hfi_device *dev, unsigned int q_index)

{

	struct hfi_queue_header *queue;

	struct vidc_iface_q_info *q_info;

	u32 write_ptr, read_ptr;



	if (q_index >= VIDC_IFACEQ_NUMQ) {

		dprintk(VIDC_ERR, "Invalid q index: %d\n", q_index);

		return -ENOENT;

	}



	q_info = &dev->iface_queues[q_index];

	if (!q_info) {

		dprintk(VIDC_ERR, "cannot read shared Q's\n");

		return -ENOENT;

	}



	queue = (struct hfi_queue_header *)q_info->q_hdr;

	if (!queue) {

		dprintk(VIDC_ERR, "queue not present\n");

		return -ENOENT;

	}



	write_ptr = (u32)queue->qhdr_write_idx;

	read_ptr = (u32)queue->qhdr_read_idx;

	return read_ptr - write_ptr;

}



static void __core_clear_interrupt(struct venus_hfi_device *device)

{

	u32 intr_status = 0;
@@ -3605,8 +3577,7 @@ static int __response_handler(struct venus_hfi_device *device) 
			*session_id = session->session_id;

		}



		if (packet_count >= max_packets &&

				__get_q_size(device, VIDC_IFACEQ_MSGQ_IDX)) {

		if (packet_count >= max_packets) {

			dprintk(VIDC_WARN,

					"Too many packets in message queue to handle at once, deferring read\n");

			break;