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
nexedi
linux
Commits
016e81f2
Commit
016e81f2
authored
Mar 16, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
parents
06e5801b
3fe0607a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
11 deletions
+24
-11
sound/soc/intel/sst-haswell-dsp.c
sound/soc/intel/sst-haswell-dsp.c
+0
-3
sound/soc/intel/sst-haswell-ipc.c
sound/soc/intel/sst-haswell-ipc.c
+24
-8
No files found.
sound/soc/intel/sst-haswell-dsp.c
View file @
016e81f2
...
...
@@ -207,9 +207,6 @@ static int hsw_parse_fw_image(struct sst_fw *sst_fw)
module
=
(
void
*
)
module
+
sizeof
(
*
module
)
+
module
->
mod_size
;
}
/* allocate scratch mem regions */
sst_block_alloc_scratch
(
dsp
);
return
0
;
}
...
...
sound/soc/intel/sst-haswell-ipc.c
View file @
016e81f2
...
...
@@ -1732,6 +1732,7 @@ static void sst_hsw_drop_all(struct sst_hsw *hsw)
int
sst_hsw_dsp_load
(
struct
sst_hsw
*
hsw
)
{
struct
sst_dsp
*
dsp
=
hsw
->
dsp
;
struct
sst_fw
*
sst_fw
,
*
t
;
int
ret
;
dev_dbg
(
hsw
->
dev
,
"loading audio DSP...."
);
...
...
@@ -1748,12 +1749,17 @@ int sst_hsw_dsp_load(struct sst_hsw *hsw)
return
ret
;
}
ret
=
sst_fw_reload
(
hsw
->
sst_fw
);
list_for_each_entry_safe_reverse
(
sst_fw
,
t
,
&
dsp
->
fw_list
,
list
)
{
ret
=
sst_fw_reload
(
sst_fw
);
if
(
ret
<
0
)
{
dev_err
(
hsw
->
dev
,
"error: SST FW reload failed
\n
"
);
sst_dsp_dma_put_channel
(
dsp
);
return
-
ENOMEM
;
}
}
ret
=
sst_block_alloc_scratch
(
hsw
->
dsp
);
if
(
ret
<
0
)
return
-
EINVAL
;
sst_dsp_dma_put_channel
(
dsp
);
return
0
;
...
...
@@ -1809,12 +1815,17 @@ int sst_hsw_dsp_runtime_suspend(struct sst_hsw *hsw)
int
sst_hsw_dsp_runtime_sleep
(
struct
sst_hsw
*
hsw
)
{
sst_fw_unload
(
hsw
->
sst_fw
);
sst_block_free_scratch
(
hsw
->
dsp
);
struct
sst_fw
*
sst_fw
,
*
t
;
struct
sst_dsp
*
dsp
=
hsw
->
dsp
;
list_for_each_entry_safe
(
sst_fw
,
t
,
&
dsp
->
fw_list
,
list
)
{
sst_fw_unload
(
sst_fw
);
}
sst_block_free_scratch
(
dsp
);
hsw
->
boot_complete
=
false
;
sst_dsp_sleep
(
hsw
->
dsp
);
sst_dsp_sleep
(
dsp
);
return
0
;
}
...
...
@@ -1943,6 +1954,11 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
goto
fw_err
;
}
/* allocate scratch mem regions */
ret
=
sst_block_alloc_scratch
(
hsw
->
dsp
);
if
(
ret
<
0
)
goto
boot_err
;
/* wait for DSP boot completion */
sst_dsp_boot
(
hsw
->
dsp
);
ret
=
wait_event_timeout
(
hsw
->
boot_wait
,
hsw
->
boot_complete
,
...
...
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