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

Commit 04d26255 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: fix setting of client buffer count"

parents 5452eeb3 bf9ef58b

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

+2 −4
Original line number Diff line number Diff line
@@ -1063,15 +1063,13 @@ static int msm_vdec_queue_setup(struct vb2_queue *q, 
			mutex_unlock(&inst->lock);

			break;

		}

		if (*num_buffers && *num_buffers >=

			bufreq->buffer_count_actual) {

		*num_buffers = max(*num_buffers, bufreq->buffer_count_min);

		if (*num_buffers != bufreq->buffer_count_actual) {

			property_id = HAL_PARAM_BUFFER_COUNT_ACTUAL;

			new_buf_count.buffer_type = HAL_BUFFER_OUTPUT;

			new_buf_count.buffer_count_actual = *num_buffers;

			rc = call_hfi_op(hdev, session_set_property,

				inst->session, property_id, &new_buf_count);

		} else {

			*num_buffers = bufreq->buffer_count_min;

		}

		mutex_unlock(&inst->lock);

		dprintk(VIDC_DBG, "count =  %d, size = %d, alignment = %d\n",