samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "video: driver: handle dequeued buffers at once" into video-kernel-waipio.lnx.1.0

Browse Source
This commit is contained in:
Linux Build Service Account
2020-12-11 18:30:35 -08:00
committed by Gerrit - the friendly Code Review server
parent b953be5b2b 55ab2680d7
commit fc4aa38fca
5 changed files with 86 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/vidc/src/msm_vidc.c
View File

@@ -802,8 +802,6 @@ void *msm_vidc_open(void *vidc_core, u32 session_type)
inst->domain = session_type;
inst->state = MSM_VIDC_OPEN;
inst->request = false;
inst->hfi_cmd_type = 0;
inst->hfi_port = 0;
for (i = 0; i < MAX_SIGNAL; i++)
init_completion(&inst->completions[i]);

21
driver/vidc/src/msm_vidc_driver.c
View File

@@ -26,27 +26,25 @@
void print_vidc_buffer(u32 tag, const char *str, struct msm_vidc_inst *inst,
struct msm_vidc_buffer *vbuf)
{
struct msm_vidc_buffer *mbuf;
if (!(tag & msm_vidc_debug) || !inst || !vbuf)
return;
mbuf = get_meta_buffer(inst, vbuf);
if (!mbuf)
if (vbuf->type == MSM_VIDC_BUF_INPUT || vbuf->type == MSM_VIDC_BUF_OUTPUT) {
dprintk(tag, inst->sid,
"%s: %s: idx %2d fd %3d off %d daddr %#llx size %d filled %d flags %#x ts %lld attr %#x\n",
str, vbuf->type == MSM_VIDC_BUF_INPUT ? "INPUT" : "OUTPUT",
vbuf->index, vbuf->fd, vbuf->data_offset,
vbuf->device_addr, vbuf->buffer_size, vbuf->data_size,
vbuf->flags, vbuf->timestamp, vbuf->attr);
else
} else if (vbuf->type == MSM_VIDC_BUF_INPUT_META ||
vbuf->type == MSM_VIDC_BUF_OUTPUT_META) {
dprintk(tag, inst->sid,
"%s: %s: idx %2d fd %3d off %d daddr %#llx size %d filled %d flags %#x ts %lld attr %#x meta: fd %3d daddr %#llx size %d\n",
str, vbuf->type == MSM_VIDC_BUF_INPUT ? "INPUT" : "OUTPUT",
"%s: %s: idx %2d fd %3d off %d daddr %#llx size %d filled %d flags %#x ts %lld attr %#x\n",
str, vbuf->type == MSM_VIDC_BUF_INPUT_META ? "INPUT_META" : "OUTPUT_META",
vbuf->index, vbuf->fd, vbuf->data_offset,
vbuf->device_addr, vbuf->buffer_size, vbuf->data_size,
vbuf->flags, vbuf->timestamp, vbuf->attr,
mbuf->fd, mbuf->device_addr, mbuf->buffer_size);
vbuf->flags, vbuf->timestamp, vbuf->attr);
}
}
void print_vb2_buffer(const char *str, struct msm_vidc_inst *inst,
@@ -706,10 +704,7 @@ struct msm_vidc_buffer *get_meta_buffer(struct msm_vidc_inst *inst,
d_vpr_e("%s: invalid params\n", __func__);
return NULL;
}
/*
* do not call print_vidc_buffer() in this function to avoid recursion,
* this function is called from print_vidc_buffer.
*/
if (buf->type == MSM_VIDC_BUF_INPUT) {
buffers = &inst->buffers.input_meta;
} else if (buf->type == MSM_VIDC_BUF_OUTPUT) {

107
driver/vidc/src/venus_hfi_response.c
View File

@@ -349,6 +349,7 @@ static int handle_input_buffer(struct msm_vidc_inst *inst,
buf->data_offset = buffer->data_offset;
buf->data_size = buffer->data_size;
buf->attr &= ~MSM_VIDC_ATTR_QUEUED;
buf->attr |= MSM_VIDC_ATTR_DEQUEUED;
buf->flags = 0;
//todo:
/*if (buffer->flags & HFI_BUF_FW_FLAG_CORRUPT) {
@@ -362,8 +363,6 @@ static int handle_input_buffer(struct msm_vidc_inst *inst,
}*/
print_vidc_buffer(VIDC_HIGH, "EBD", inst, buf);
msm_vidc_vb2_buffer_done(inst, buf);
msm_vidc_put_driver_buf(inst, buf);
return rc;
}
@@ -397,6 +396,7 @@ static int handle_output_buffer(struct msm_vidc_inst *inst,
buf->timestamp = buffer->timestamp;
buf->attr &= ~MSM_VIDC_ATTR_QUEUED;
buf->attr |= MSM_VIDC_ATTR_DEQUEUED;
if (buffer->flags & HFI_BUF_FW_FLAG_READONLY)
buf->attr |= MSM_VIDC_ATTR_READ_ONLY;
else
@@ -418,8 +418,6 @@ static int handle_output_buffer(struct msm_vidc_inst *inst,
buf->flags |= MSM_VIDC_BUF_FLAG_SUBFRAME;*/
print_vidc_buffer(VIDC_HIGH, "FBD", inst, buf);
msm_vidc_vb2_buffer_done(inst, buf);
msm_vidc_put_driver_buf(inst, buf);
return rc;
}
@@ -443,17 +441,19 @@ static int handle_input_metadata_buffer(struct msm_vidc_inst *inst,
break;
}
}
if (found) {
s_vpr_h(inst->sid,
"input metadata buffer done: idx %d fd %d daddr %#x\n",
buf->index, buf->fd, buf->device_addr);
msm_vidc_vb2_buffer_done(inst, buf);
msm_vidc_put_driver_buf(inst, buf);
} else {
if (!found) {
s_vpr_e(inst->sid, "%s: invalid idx %d daddr %#x\n",
__func__, buffer->index, buffer->base_address);
return -EINVAL;
}
buf->data_size = buffer->data_size;
buf->attr &= ~MSM_VIDC_ATTR_QUEUED;
buf->attr |= MSM_VIDC_ATTR_DEQUEUED;
buf->flags = 0;
if (buffer->flags & HFI_BUF_FW_FLAG_LAST)
buf->flags |= MSM_VIDC_BUF_FLAG_LAST;
print_vidc_buffer(VIDC_HIGH, "EBD META", inst, buf);
return rc;
}
@@ -476,17 +476,51 @@ static int handle_output_metadata_buffer(struct msm_vidc_inst *inst,
break;
}
}
if (found) {
s_vpr_h(inst->sid,
"output metadata buffer done: idx %d fd %d daddr %#x\n",
buf->index, buf->fd, buf->device_addr);
msm_vidc_vb2_buffer_done(inst, buf);
msm_vidc_put_driver_buf(inst, buf);
} else {
if (!found) {
s_vpr_e(inst->sid, "%s: invalid idx %d daddr %#x\n",
__func__, buffer->index, buffer->base_address);
return -EINVAL;
}
buf->data_size = buffer->data_size;
buf->attr &= ~MSM_VIDC_ATTR_QUEUED;
buf->attr |= MSM_VIDC_ATTR_DEQUEUED;
buf->flags = 0;
if (buffer->flags & HFI_BUF_FW_FLAG_LAST)
buf->flags |= MSM_VIDC_BUF_FLAG_LAST;
print_vidc_buffer(VIDC_HIGH, "FBD META", inst, buf);
return rc;
}
static int handle_dequeue_buffers(struct msm_vidc_inst* inst)
{
int rc = 0;
int i;
struct msm_vidc_buffers* buffers;
struct msm_vidc_buffer* buf;
struct msm_vidc_buffer* dummy;
enum msm_vidc_buffer_type buffer_type[] = {
MSM_VIDC_BUF_INPUT_META,
MSM_VIDC_BUF_INPUT,
MSM_VIDC_BUF_OUTPUT_META,
MSM_VIDC_BUF_OUTPUT,
};
for (i = 0; i < ARRAY_SIZE(buffer_type); i++) {
buffers = msm_vidc_get_buffers(inst, buffer_type[i], __func__);
if (!buffers)
return -EINVAL;
list_for_each_entry_safe(buf, dummy, &buffers->list, list) {
if (buf->attr & MSM_VIDC_ATTR_DEQUEUED) {
buf->attr &= ~MSM_VIDC_ATTR_DEQUEUED;
msm_vidc_vb2_buffer_done(inst, buf);
msm_vidc_put_driver_buf(inst, buf);
}
}
}
return rc;
}
@@ -920,6 +954,8 @@ static int handle_session_response(struct msm_vidc_core *core,
struct msm_vidc_inst *inst;
struct hfi_packet *packet;
u8 *pkt;
u32 hfi_cmd_type = 0;
u32 hfi_port = 0;
int i;
inst = get_inst(core, hdr->session_id);
@@ -929,8 +965,8 @@ static int handle_session_response(struct msm_vidc_core *core,
}
mutex_lock(&inst->lock);
inst->hfi_cmd_type = 0;
inst->hfi_port = 0;
hfi_cmd_type = 0;
hfi_port = 0;
pkt = (u8 *)((u8 *)hdr + sizeof(struct hfi_header));
for (i = 0; i < hdr->num_packets; i++) {
@@ -942,15 +978,15 @@ static int handle_session_response(struct msm_vidc_core *core,
packet = (struct hfi_packet *)pkt;
if (packet->type > HFI_CMD_BEGIN &&
packet->type < HFI_CMD_END) {
if (inst->hfi_cmd_type == HFI_CMD_SETTINGS_CHANGE) {
if (hfi_cmd_type == HFI_CMD_SETTINGS_CHANGE) {
s_vpr_e(inst->sid,
"%s: invalid cmd %d, port %d \n",
__func__, inst->hfi_cmd_type,
inst->hfi_port);
return -EINVAL;
"%s: invalid packet type %d in port settings change\n",
__func__, packet->type);
rc = -EINVAL;
goto exit;
}
inst->hfi_cmd_type = packet->type;
inst->hfi_port = packet->port;
hfi_cmd_type = packet->type;
hfi_port = packet->port;
rc = handle_session_command(inst, packet);
} else if (packet->type > HFI_PROP_BEGIN &&
packet->type < HFI_PROP_END) {
@@ -970,11 +1006,22 @@ static int handle_session_response(struct msm_vidc_core *core,
pkt += packet->size;
}
if (inst->hfi_cmd_type == HFI_CMD_SETTINGS_CHANGE) {
if (inst->hfi_port == HFI_PORT_BITSTREAM)
if (hfi_cmd_type == HFI_CMD_BUFFER) {
rc = handle_dequeue_buffers(inst);
if (rc)
goto exit;
}
if (hfi_cmd_type == HFI_CMD_SETTINGS_CHANGE) {
if (hfi_port == HFI_PORT_BITSTREAM) {
rc = msm_vdec_input_port_settings_change(inst);
else if (inst->hfi_port == HFI_PORT_RAW)
if (rc)
goto exit;
} else if (hfi_port == HFI_PORT_RAW) {
rc = msm_vdec_output_port_settings_change(inst);
if (rc)
goto exit;
}
}
exit: