Merge "msm: vidc: Remove unnecessary check condition" into msm-4.9 (924daebd) · Commits · e / devices / android_kernel_fairphone_FP3

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -300,8 +300,8 @@ static int hfi_process_session_error(u32 device_id,
		cmd_done.device_id = device_id;
		cmd_done.session_id = (void *)(uintptr_t)pkt->session_id;
		cmd_done.status = hfi_map_err_status(pkt->event_data1);
		dprintk(VIDC_INFO, "Received: SESSION_ERROR with event id : %d\n",
		pkt->event_data1);
		dprintk(VIDC_INFO, "Received: SESSION_ERROR with event id : %#x %#x\n",
		pkt->event_data1, pkt->event_data2);
		switch (pkt->event_data1) {
		case HFI_ERR_SESSION_INVALID_SCALE_FACTOR:
		case HFI_ERR_SESSION_UNSUPPORT_BUFFERTYPE:
		@@ -313,7 +313,9 @@ static int hfi_process_session_error(u32 device_id,
		info->response.cmd = cmd_done;
		return 0;
		default:
		dprintk(VIDC_ERR, "HFI_EVENT_SESSION_ERROR\n");
		dprintk(VIDC_ERR,
		"HFI_EVENT_SESSION_ERROR: data1 %#x, data2 %#x\n",
		pkt->event_data1, pkt->event_data2);
		info->response_type = HAL_SESSION_ERROR;
		info->response.cmd = cmd_done;
		return 0;

+0 −6

Original line number	Diff line number	Diff line
		@@ -1018,12 +1018,6 @@ int msm_vidc_dqbuf(void instance, struct v4l2_buffer b)
		b->m.planes[i].m.userptr = buffer_info->uvaddr[i];
		b->m.planes[i].reserved[0] = buffer_info->fd[i];
		b->m.planes[i].reserved[1] = buffer_info->buff_off[i];
		if (!b->m.planes[i].m.userptr) {
		dprintk(VIDC_ERR,
		"%s: Failed to find user virtual address, %#lx, %d, %d\n",
		__func__, b->m.planes[i].m.userptr, b->type, i);
		return -EINVAL;
		}
		}

		if (!buffer_info) {

+9 −12

Original line number	Diff line number	Diff line
		@@ -5345,22 +5345,19 @@ int msm_vidc_comm_s_parm(struct msm_vidc_inst inst, struct v4l2_streamparm a)
		goto exit;
		}

		if (inst->prop.fps != fps) {
		dprintk(VIDC_PROF, "reported fps changed for %pK: %d->%d\n",
		inst, inst->prop.fps, fps);
		inst->prop.fps = fps;
		if (inst->session_type == MSM_VIDC_ENCODER) {
		frame_rate.frame_rate = inst->prop.fps * BIT(16);
		frame_rate.buffer_type = HAL_BUFFER_OUTPUT;
		pdata = &frame_rate;
		if (inst->session_type == MSM_VIDC_ENCODER) {
		rc = call_hfi_op(hdev, session_set_property,
		inst->session, property_id, pdata);

		if (rc)
		dprintk(VIDC_WARN,
		"Failed to set frame rate %d\n", rc);
		}
		}
		exit:
		return rc;
		}

+0 −6

Original line number	Diff line number	Diff line
		@@ -1394,12 +1394,6 @@ static int __iface_dbgq_read(struct venus_hfi_device device, void pkt)

		__strict_check(device);

		if (!__core_in_valid_state(device)) {
		dprintk(VIDC_DBG, "%s - fw not in init state\n", __func__);
		rc = -EINVAL;
		goto dbg_error_null;
		}

		if (device->iface_queues[VIDC_IFACEQ_DBGQ_IDX].
		q_array.align_virtual_addr == 0) {
		dprintk(VIDC_ERR, "cannot read from shared DBG Q's\n");