Merge "msm: vidc: Update extradata buffer count calculations" (96e9d890) · Commits · e / devices / android_kernel_fairphone_FP3

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

+28 −1

Original line number	Diff line number	Diff line
		@@ -4073,7 +4073,6 @@ int msm_vidc_update_host_buff_counts(struct msm_vidc_inst *inst)
		}

		/* For DPB buffers, no need to add Extra buffers */

		bufreq->buffer_count_min_host = bufreq->buffer_count_actual =
		bufreq->buffer_count_min;

		@@ -4091,6 +4090,20 @@ int msm_vidc_update_host_buff_counts(struct msm_vidc_inst *inst)

		bufreq->buffer_count_min_host = bufreq->buffer_count_actual =
		bufreq->buffer_count_min + extra_buffers;

		bufreq = get_buff_req_buffer(inst,
		HAL_BUFFER_EXTRADATA_OUTPUT2);
		if (!bufreq) {
		dprintk(VIDC_DBG,
		"No buffer requirements : %x\n",
		HAL_BUFFER_EXTRADATA_OUTPUT2);
		} else {
		if (bufreq->buffer_count_min) {
		bufreq->buffer_count_min_host =
		bufreq->buffer_count_actual =
		bufreq->buffer_count_min + extra_buffers;
		}
		}
		} else {

		bufreq = get_buff_req_buffer(inst,
		@@ -4107,6 +4120,20 @@ int msm_vidc_update_host_buff_counts(struct msm_vidc_inst *inst)

		bufreq->buffer_count_min_host = bufreq->buffer_count_actual =
		bufreq->buffer_count_min + extra_buffers;

		bufreq = get_buff_req_buffer(inst,
		HAL_BUFFER_EXTRADATA_OUTPUT);
		if (!bufreq) {
		dprintk(VIDC_DBG,
		"No buffer requirements : %x\n",
		HAL_BUFFER_EXTRADATA_OUTPUT);
		} else {
		if (bufreq->buffer_count_min) {
		bufreq->buffer_count_min_host =
		bufreq->buffer_count_actual =
		bufreq->buffer_count_min + extra_buffers;
		}
		}
		}

		return 0;