Merge "msm: vidc: Cleanup HFI_CMD_SESSION_SYNC support"

This commit is contained in:
qctecmdr 2020-09-11 12:41:38 -07:00 • committed by Gerrit - the friendly Code Review server
commit b580a91082
5 changed files with 0 additions and 51 deletions

View file

@ -2292,7 +2292,6 @@ static int venus_hfi_session_process_batch(void *sess,
int rc = 0, c = 0;
struct hal_session *session = sess;
struct venus_hfi_device *device = &venus_hfi_dev;
struct hfi_cmd_session_sync_process_packet pkt;
mutex_lock(&device->lock);
@ -2319,15 +2318,6 @@ static int venus_hfi_session_process_batch(void *sess,
}
}
rc = call_hfi_pkt_op(device, session_sync_process, &pkt, session->sid);
if (rc) {
s_vpr_e(session->sid, "Failed to create sync packet\n");
goto err_etbs_and_ftbs;
}
if (__iface_cmdq_write(device, &pkt, session->sid))
rc = -ENOTEMPTY;
err_etbs_and_ftbs:
mutex_unlock(&device->lock);
return rc;

View file

@ -671,21 +671,6 @@ int create_pkt_cmd_sys_image_version(
return 0;
}
int create_pkt_cmd_session_sync_process(
struct hfi_cmd_session_sync_process_packet *pkt, u32 sid)
{
if (!pkt)
return -EINVAL;
*pkt = (struct hfi_cmd_session_sync_process_packet) {0};
pkt->size = sizeof(*pkt);
pkt->packet_type = HFI_CMD_SESSION_SYNC;
pkt->sid = sid;
pkt->sync_id = 0;
return 0;
}
static struct hfi_packetization_ops hfi_default = {
.sys_init = create_pkt_cmd_sys_init,
.sys_pc_prep = create_pkt_cmd_sys_pc_prep,
@ -707,7 +692,6 @@ static struct hfi_packetization_ops hfi_default = {
.session_get_buf_req = create_pkt_cmd_session_get_buf_req,
.session_flush = create_pkt_cmd_session_flush,
.session_set_property = create_pkt_cmd_session_set_property,
.session_sync_process = create_pkt_cmd_session_sync_process,
};
struct hfi_packetization_ops *hfi_get_pkt_ops_handle(

View file

@ -64,8 +64,6 @@ struct hfi_packetization_ops {
int (*session_set_property)(
struct hfi_cmd_session_set_property_packet *pkt,
u32 sid, u32 ptype, void *pdata, u32 size);
int (*session_sync_process)(
struct hfi_cmd_session_sync_process_packet *pkt, u32 sid);
};
struct hfi_packetization_ops *hfi_get_pkt_ops_handle(

View file

@ -1153,18 +1153,6 @@ static int hfi_process_sys_property_info(u32 device_id,
}
static int hfi_process_ignore(u32 device_id,
void *_pkt,
struct msm_vidc_cb_info *info)
{
*info = (struct msm_vidc_cb_info) {
.response_type = HAL_RESPONSE_UNUSED,
};
d_vpr_h("RECEIVED: SESSION_SYNC_DONE\n");
return 0;
}
int hfi_process_msg_packet(u32 device_id, struct vidc_hal_msg_pkt_hdr *msg_hdr,
struct msm_vidc_cb_info *info)
{
@ -1225,9 +1213,6 @@ int hfi_process_msg_packet(u32 device_id, struct vidc_hal_msg_pkt_hdr *msg_hdr,
case HFI_MSG_SYS_SESSION_ABORT_DONE:
pkt_func = (pkt_func_def)hfi_process_session_abort_done;
break;
case HFI_MSG_SESSION_SYNC_DONE:
pkt_func = (pkt_func_def)hfi_process_ignore;
break;
default:
d_vpr_l("Unable to parse message: %#x\n", msg_hdr->packet);
break;

View file

@ -963,14 +963,6 @@ struct hfi_buffer_mapping_type {
u32 size;
};
struct hfi_cmd_session_sync_process_packet {
u32 size;
u32 packet_type;
u32 sid;
u32 sync_id;
u32 rg_data[1];
};
struct hfi_msg_event_notify_packet {
u32 size;
u32 packet_type;