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

Commit 4e0c00ec authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cvp: Support CVP session abort"

parents e3f3ccb2 396475a0

drivers/media/platform/msm/cvp/cvp_hfi.c

+0 −1
Original line number Diff line number Diff line
@@ -2674,7 +2674,6 @@ static int venus_hfi_session_abort(void *sess) 


	mutex_lock(&device->lock);



	__flush_debug_queue(device, NULL);

	rc = __send_session_cmd(session, HFI_CMD_SYS_SESSION_ABORT);



	mutex_unlock(&device->lock);

drivers/media/platform/msm/cvp/cvp_hfi_api.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ enum hal_ssr_trigger_type { 
	SSR_ERR_FATAL = 1,

	SSR_SW_DIV_BY_ZERO,

	SSR_HW_WDOG_IRQ,

	SSR_SESSION_ABORT,

};



struct cvp_hal_profile_level {

drivers/media/platform/msm/cvp/cvp_hfi_helper.h

+10 −2
Original line number Diff line number Diff line
@@ -573,8 +573,8 @@ struct cvp_hfi_client { 
	u32 transaction_id;

	u32 data1;

	u32 data2;

	u32 data3;

	u32 data4;

	u32 kdata1;

	u32 kdata2;

	u32 reserved1;

	u32 reserved2;

};
@@ -637,6 +637,14 @@ struct cvp_session_release_buffers_packet_d { 
	u32 buffer_idx;

};



struct cvp_hfi_cmd_session_hdr {

	u32 size;

	u32 packet_type;

	u32 session_id;

	struct cvp_hfi_client client_data;

	u32 stream_idx;

};



struct cvp_hfi_msg_session_hdr {

	u32 size;

	u32 packet_type;

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

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int hfi_process_session_error(u32 device_id, 
		dprintk(CVP_ERR,

			"%s: session %x data1 %#x, data2 %#x\n", __func__,

			pkt->session_id, pkt->event_data1, pkt->event_data2);

		info->response_type = HAL_SESSION_ERROR;

		info->response_type = HAL_RESPONSE_UNUSED;

		break;

	}

drivers/media/platform/msm/cvp/msm_cvp.c

+373 −73

File changed.

Preview size limit exceeded, changes collapsed.