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

Commit c3d7c41c 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 handling for seq header done" into msm-4.9

parents 8d75c9f6 846b7535

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

+1 −0
Original line number Diff line number Diff line
@@ -1715,6 +1715,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
			enable.enable = 0;

			break;

		case V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME:

			enable.enable = 1;

		default:

			rc = -ENOTSUPP;

			break;

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

+0 −52
Original line number Diff line number Diff line
@@ -2434,55 +2434,6 @@ static void handle_fbd(enum hal_command_response cmd, void *data) 
	put_inst(inst);

}



static void handle_seq_hdr_done(enum hal_command_response cmd, void *data)

{

	struct msm_vidc_cb_data_done *response = data;

	struct msm_vidc_inst *inst;

	struct vb2_buffer *vb;

	struct vidc_hal_fbd *fill_buf_done;

	struct vb2_v4l2_buffer *vbuf;



	if (!response) {

		dprintk(VIDC_ERR, "Invalid response from vidc_hal\n");

		return;

	}



	inst = get_inst(get_vidc_core(response->device_id),

			response->session_id);

	if (!inst) {

		dprintk(VIDC_WARN, "Got a response for an inactive session\n");

		return;

	}



	fill_buf_done = (struct vidc_hal_fbd *)&response->output_done;

	vb = get_vb_from_device_addr(&inst->bufq[CAPTURE_PORT],

				fill_buf_done->packet_buffer1);

	if (!vb) {

		dprintk(VIDC_ERR,

				"Failed to find video buffer for seq_hdr_done: %pa\n",

				&fill_buf_done->packet_buffer1);

		goto err_seq_hdr_done;

	}

	vbuf = to_vb2_v4l2_buffer(vb);

	vb->timestamp = 0;



	vb->planes[0].bytesused = fill_buf_done->filled_len1;

	vb->planes[0].data_offset = fill_buf_done->offset1;



	vbuf->flags = V4L2_QCOM_BUF_FLAG_CODECCONFIG;



	dprintk(VIDC_DBG, "Filled length = %d; offset = %d; flags %x\n",

				vb->planes[0].bytesused,

				vb->planes[0].data_offset,

				vbuf->flags);

	mutex_lock(&inst->bufq[CAPTURE_PORT].lock);

	vb2_buffer_done(vb, VB2_BUF_STATE_DONE);

	mutex_unlock(&inst->bufq[CAPTURE_PORT].lock);



err_seq_hdr_done:

	put_inst(inst);

}



void handle_cmd_response(enum hal_command_response cmd, void *data)

{

	dprintk(VIDC_DBG, "Command response = %d\n", cmd);
@@ -2527,9 +2478,6 @@ void handle_cmd_response(enum hal_command_response cmd, void *data) 
	case HAL_SESSION_FLUSH_DONE:

		handle_session_flush(cmd, data);

		break;

	case HAL_SESSION_GET_SEQ_HDR_DONE:

		handle_seq_hdr_done(cmd, data);

		break;

	case HAL_SYS_WATCHDOG_TIMEOUT:

	case HAL_SYS_ERROR:

		handle_sys_error(cmd, data);

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

+0 −2
Original line number Diff line number Diff line
@@ -3176,14 +3176,12 @@ static int __response_handler(struct venus_hfi_device *device) 
		case HAL_SESSION_RESUME_DONE:

		case HAL_SESSION_SET_PROP_DONE:

		case HAL_SESSION_GET_PROP_DONE:

		case HAL_SESSION_PARSE_SEQ_HDR_DONE:

		case HAL_SESSION_RELEASE_BUFFER_DONE:

		case HAL_SESSION_RELEASE_RESOURCE_DONE:

		case HAL_SESSION_PROPERTY_INFO:

			session_id = &info->response.cmd.session_id;

			break;

		case HAL_SESSION_ERROR:

		case HAL_SESSION_GET_SEQ_HDR_DONE:

		case HAL_SESSION_ETB_DONE:

		case HAL_SESSION_FTB_DONE:

			session_id = &info->response.data.session_id;

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+0 −2
Original line number Diff line number Diff line
@@ -1227,8 +1227,6 @@ enum hal_command_response { 
	HAL_SESSION_RESUME_DONE,

	HAL_SESSION_SET_PROP_DONE,

	HAL_SESSION_GET_PROP_DONE,

	HAL_SESSION_PARSE_SEQ_HDR_DONE,

	HAL_SESSION_GET_SEQ_HDR_DONE,

	HAL_SESSION_RELEASE_BUFFER_DONE,

	HAL_SESSION_RELEASE_RESOURCE_DONE,

	HAL_SESSION_PROPERTY_INFO,