Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
63fa58d9
Commit
63fa58d9
authored
Nov 16, 2020
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge Intel catpt DSP fixes into asoc-5.10
parents
bd6327fd
1072460a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
sound/soc/intel/catpt/pcm.c
sound/soc/intel/catpt/pcm.c
+4
-5
No files found.
sound/soc/intel/catpt/pcm.c
View file @
63fa58d9
...
...
@@ -458,10 +458,6 @@ static int catpt_dai_prepare(struct snd_pcm_substream *substream,
if
(
ret
)
return
CATPT_IPC_ERROR
(
ret
);
ret
=
catpt_dsp_update_lpclock
(
cdev
);
if
(
ret
)
return
ret
;
ret
=
catpt_dai_apply_usettings
(
dai
,
stream
);
if
(
ret
)
return
ret
;
...
...
@@ -500,6 +496,7 @@ static int catpt_dai_trigger(struct snd_pcm_substream *substream, int cmd,
case
SNDRV_PCM_TRIGGER_RESUME
:
case
SNDRV_PCM_TRIGGER_PAUSE_RELEASE
:
resume_stream:
catpt_dsp_update_lpclock
(
cdev
);
ret
=
catpt_ipc_resume_stream
(
cdev
,
stream
->
info
.
stream_hw_id
);
if
(
ret
)
return
CATPT_IPC_ERROR
(
ret
);
...
...
@@ -507,11 +504,11 @@ static int catpt_dai_trigger(struct snd_pcm_substream *substream, int cmd,
case
SNDRV_PCM_TRIGGER_STOP
:
stream
->
prepared
=
false
;
catpt_dsp_update_lpclock
(
cdev
);
fallthrough
;
case
SNDRV_PCM_TRIGGER_SUSPEND
:
case
SNDRV_PCM_TRIGGER_PAUSE_PUSH
:
ret
=
catpt_ipc_pause_stream
(
cdev
,
stream
->
info
.
stream_hw_id
);
catpt_dsp_update_lpclock
(
cdev
);
if
(
ret
)
return
CATPT_IPC_ERROR
(
ret
);
break
;
...
...
@@ -534,6 +531,8 @@ void catpt_stream_update_position(struct catpt_dev *cdev,
dsppos
=
bytes_to_frames
(
r
,
pos
->
stream_position
);
if
(
!
stream
->
prepared
)
goto
exit
;
/* only offload is set_write_pos driven */
if
(
stream
->
template
->
type
!=
CATPT_STRM_TYPE_RENDER
)
goto
exit
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment