samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
複製 0
程式碼 問題管理 合併請求 Actions Packages Projects 版本發佈 Wiki Activity

Merge "dsp: Add support for EOS V2"

瀏覽代碼
This commit is contained in:
qctecmdr
2020-04-08 21:02:10 -07:00
committed by Gerrit - the friendly Code Review server
父節點 4753bad23a 54d42ba9df
當前提交 4ec39896a8
共有 6 個文件被更改，包括 13 次插入 和 2 次删除
Download Patch File Download Diff File Expand all files Collapse all files

1
asoc/msm-compress-q6-v2.c
查看文件

@@ -728,6 +728,7 @@ static void compr_event_handler(uint32_t opcode,
break;
case ASM_DATA_EVENT_RENDERED_EOS:
case ASM_DATA_EVENT_RENDERED_EOS_V2:
spin_lock_irqsave(&prtd->lock, flags);
pr_debug("%s: ASM_DATA_CMDRSP_EOS token 0x%x,stream id %d\n",
__func__, token, stream_id);

1
asoc/msm-pcm-q6-v2.c
查看文件

@@ -176,6 +176,7 @@ static void event_handler(uint32_t opcode,
break;
}
case ASM_DATA_EVENT_RENDERED_EOS:
case ASM_DATA_EVENT_RENDERED_EOS_V2:
pr_debug("ASM_DATA_EVENT_RENDERED_EOS\n");
clear_bit(CMD_EOS, &prtd->cmd_pending);
wake_up(&the_locks.eos_wait);

1
dsp/codecs/q6audio_v2.c
查看文件

@@ -39,6 +39,7 @@ void q6asm_in_cb(uint32_t opcode, uint32_t token,
wake_up(&audio->write_wait);
break;
case ASM_DATA_EVENT_RENDERED_EOS:
case ASM_DATA_EVENT_RENDERED_EOS_V2:
audio->eos_rsp = 1;
wake_up(&audio->read_wait);
break;

2
dsp/codecs/q6audio_v2_aio.c
查看文件

@@ -24,6 +24,7 @@ void q6_audio_cb(uint32_t opcode, uint32_t token,
case ASM_DATA_EVENT_WRITE_DONE_V2:
case ASM_DATA_EVENT_READ_DONE_V2:
case ASM_DATA_EVENT_RENDERED_EOS:
case ASM_DATA_EVENT_RENDERED_EOS_V2:
case ASM_DATA_CMD_MEDIA_FMT_UPDATE_V2:
case ASM_STREAM_CMD_SET_ENCDEC_PARAM:
case ASM_DATA_EVENT_SR_CM_CHANGE_NOTIFY:
@@ -60,6 +61,7 @@ void audio_aio_cb(uint32_t opcode, uint32_t token,
audio_aio_async_read_ack(audio, token, payload);
break;
case ASM_DATA_EVENT_RENDERED_EOS:
case ASM_DATA_EVENT_RENDERED_EOS_V2:
/* EOS Handle */
pr_debug("%s[%pK]:ASM_DATA_CMDRSP_EOS\n", __func__, audio);
if (audio->feedback) { /* Non-Tunnel mode */

7
dsp/q6asm.c
查看文件

@@ -1984,6 +1984,7 @@ static int32_t q6asm_callback(struct apr_client_data *data, void *priv)
data->token, data->payload_size, data->src_port,
data->dest_port);
if ((data->opcode != ASM_DATA_EVENT_RENDERED_EOS) &&
(data->opcode != ASM_DATA_EVENT_RENDERED_EOS_V2) &&
(data->opcode != ASM_DATA_EVENT_EOS) &&
(data->opcode != ASM_SESSION_EVENTX_OVERFLOW) &&
(data->opcode != ASM_SESSION_EVENT_RX_UNDERFLOW)) {
@@ -2010,6 +2011,7 @@ static int32_t q6asm_callback(struct apr_client_data *data, void *priv)
case ASM_SESSION_CMD_PAUSE:
case ASM_SESSION_CMD_SUSPEND:
case ASM_DATA_CMD_EOS:
case ASM_DATA_CMD_EOS_V2:
case ASM_STREAM_CMD_CLOSE:
case ASM_STREAM_CMD_FLUSH:
case ASM_SESSION_CMD_RUN_V2:
@@ -2347,6 +2349,7 @@ static int32_t q6asm_callback(struct apr_client_data *data, void *priv)
}
case ASM_DATA_EVENT_EOS:
case ASM_DATA_EVENT_RENDERED_EOS:
case ASM_DATA_EVENT_RENDERED_EOS_V2:
pr_debug("%s: EOS ACK received: rxed session %d opcode 0x%x token 0x%x src %d dest %d\n",
__func__, ac->session,
data->opcode, data->token,
@@ -10374,7 +10377,7 @@ static int __q6asm_cmd(struct audio_client *ac, int cmd, uint32_t stream_id)
break;
case CMD_EOS:
pr_debug("%s: CMD_EOS\n", __func__);
hdr.opcode = ASM_DATA_CMD_EOS;
hdr.opcode = ASM_DATA_CMD_EOS_V2;
atomic_set(&ac->cmd_state, 0);
state = &ac->cmd_state;
break;
@@ -10524,7 +10527,7 @@ static int __q6asm_cmd_nowait(struct audio_client *ac, int cmd,
break;
case CMD_EOS:
pr_debug("%s: CMD_EOS\n", __func__);
hdr.opcode = ASM_DATA_CMD_EOS;
hdr.opcode = ASM_DATA_CMD_EOS_V2;
break;
case CMD_CLOSE:
pr_debug("%s: CMD_CLOSE\n", __func__);

3
include/dsp/apr_audio-v2.h
查看文件

@@ -7247,6 +7247,9 @@ struct asm_data_cmd_read_v2 {
#define ASM_DATA_EVENT_RENDERED_EOS 0x00010C1C
#define ASM_DATA_EVENT_EOS 0x00010BDD
#define ASM_DATA_CMD_EOS_V2 0x00012F3C
#define ASM_DATA_EVENT_RENDERED_EOS_V2 0x00012F3D
#define ASM_DATA_EVENT_WRITE_DONE_V2 0x00010D99
struct asm_data_event_write_done_v2 {
u32 buf_addr_lsw;