OrgACRN
/
clear-pkgs-linux-iot-lts2018
mirror of https://github.com/clearlinux-pkgs/linux-iot-lts2018.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update to PKT lts-v4.19.13-base-190118T221148Z 

Signed-off-by: Alek Du <alek.du@intel.com>
This commit is contained in:
Alek Du 2019-01-21 00:14:12 +00:00
parent f2142aee2e
commit b05fb774a3
8 changed files with 518 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
0881-ASoC-Intel-Skylake-Add-FE-and-BE-DAIs-for-U.patch Normal file
View File

@ -0,0 +1,193 @@
From 77e624181d7190e8494ceaa62a9544607d48ebaa Mon Sep 17 00:00:00 2001
From: Adam Wulw <adam.wulw@intel.com>
Date: Tue, 30 Oct 2018 07:08:36 +0100
Subject: [PATCH 1/5] ASoC: Intel: Skylake: Add FE and BE DAIs for ULL(Ultra
low latency)
Change-Id: I5476997186812d5ff74c9bfce704678240fe1e80
Signed-off-by: Adam Wulw <adam.wulw@intel.com>
Signed-off-by: Szymon Mielczarek <szymonx.mielczarek@intel.com>
Tracked-On: OAM-72117
Tested-by: Bozek, DominikX <dominikx.bozek@intel.com>
Reviewed-by: Lewandowski, Gustaw <gustaw.lewandowski@intel.com>
---
sound/soc/intel/skylake/skl-pcm.c | 156 ++++++++++++++++++++++++++++++
1 file changed, 156 insertions(+)
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index 4cf1c29ff65a..9a2fffa4ecd2 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -1172,6 +1172,92 @@ static struct snd_soc_dai_driver skl_fe_dai[] = {
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
},
},
+#if IS_ENABLED(CONFIG_SND_SOC_INTEL_BXT_ULL_MACH)
+{
+ .name = "System Pin 3",
+ .ops = &skl_pcm_dai_ops,
+ .capture = {
+ .stream_name = "System Capture 3",
+ .channels_min = HDA_MONO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_8000_192000 | SNDRV_PCM_RATE_KNOT,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+ },
+ .playback = {
+ .stream_name = "System Playback 3",
+ .channels_min = HDA_MONO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_8000_192000 | SNDRV_PCM_RATE_KNOT,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE |
+ SNDRV_PCM_FMTBIT_FLOAT_LE,
+ },
+},
+{
+ .name = "System Pin 4",
+ .ops = &skl_pcm_dai_ops,
+ .capture = {
+ .stream_name = "System Capture 4",
+ .channels_min = HDA_MONO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_8000_192000 | SNDRV_PCM_RATE_KNOT,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+ },
+ .playback = {
+ .stream_name = "System Playback 4",
+ .channels_min = HDA_MONO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_8000_192000 | SNDRV_PCM_RATE_KNOT,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE |
+ SNDRV_PCM_FMTBIT_FLOAT_LE,
+ },
+},
+{
+ .name = "System Pin 5",
+ .ops = &skl_pcm_dai_ops,
+ .capture = {
+ .stream_name = "PT Capture",
+ .channels_min = HDA_MONO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_8000_192000 | SNDRV_PCM_RATE_KNOT,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+ },
+ .playback = {
+ .stream_name = "System Playback 5",
+ .channels_min = HDA_MONO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_8000_192000 | SNDRV_PCM_RATE_KNOT,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE |
+ SNDRV_PCM_FMTBIT_FLOAT_LE,
+ },
+},
+{
+ .name = "System Pin 6",
+ .ops = &skl_pcm_dai_ops,
+ .capture = {
+ .stream_name = "System Capture 6",
+ .channels_min = HDA_MONO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_8000_192000 | SNDRV_PCM_RATE_KNOT,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+ },
+ .playback = {
+ .stream_name = "System Playback 6",
+ .channels_min = HDA_MONO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_8000_192000 | SNDRV_PCM_RATE_KNOT,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE |
+ SNDRV_PCM_FMTBIT_FLOAT_LE,
+ },
+},
+#endif
{
.name = "Echoref Pin",
.ops = &skl_pcm_dai_ops,
@@ -1315,6 +1401,76 @@ static struct snd_soc_dai_driver skl_platform_dai[] = {
},
},
#endif
+#if IS_ENABLED(CONFIG_SND_SOC_INTEL_BXT_ULL_MACH)
+{
+ .name = "SSP0-B Pin",
+ .ops = &skl_be_ssp_dai_ops,
+ .playback = {
+ .stream_name = "ssp0-b Tx",
+ .channels_min = HDA_MONO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
+ SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
+ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
+ SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
+ SNDRV_PCM_RATE_192000,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+ },
+ .capture = {
+ .stream_name = "ssp0-b Rx",
+ .channels_min = HDA_MONO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
+ SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
+ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
+ SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
+ SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_64000,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+ },
+},
+{
+ .name = "SSP1-B Pin",
+ .ops = &skl_be_ssp_dai_ops,
+ .playback = {
+ .stream_name = "ssp1-b Tx",
+ .channels_min = HDA_STEREO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_48000,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+ },
+ .capture = {
+ .stream_name = "ssp1-b Rx",
+ .channels_min = HDA_STEREO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_48000,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+ },
+},
+{
+ .name = "SSP2-B Pin",
+ .ops = &skl_be_ssp_dai_ops,
+ .playback = {
+ .stream_name = "ssp2-b Tx",
+ .channels_min = HDA_STEREO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+ },
+ .capture = {
+ .stream_name = "ssp2-b Rx",
+ .channels_min = HDA_STEREO,
+ .channels_max = HDA_8_CH,
+ .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+ },
+},
+#endif
{
.name = "iDisp1 Pin",
.ops = &skl_link_dai_ops,
--
2.17.1

88
0882-Revert-ASoC-Intel-board-Add-support-for-FE-.patch Normal file
View File

@ -0,0 +1,88 @@
From 868e319a989f54ec6514c8ac8be99aa95a63ef22 Mon Sep 17 00:00:00 2001
From: Szymon Mielczarek <szymonx.mielczarek@intel.com>
Date: Tue, 11 Dec 2018 07:05:01 +0100
Subject: [PATCH 2/5] Revert "ASoC: Intel: board: Add support for FE dynamic
dai for ULL"
Due to some issues with dynamic dais, we will not support them
for ULL at the momemnt, from the topology as well.
This reverts commit e7621f644c5fff60650c0bbe5741dc7e061a6a22.
Change-Id: I1e1e0c5d9aa3bc4afc59ee7b2113a8af001aedc1
Signed-off-by: Szymon Mielczarek <szymonx.mielczarek@intel.com>
Tracked-On: OAM-72117
Reviewed-by: Lewandowski, Gustaw <gustaw.lewandowski@intel.com>
Tested-by: Bozek, DominikX <dominikx.bozek@intel.com>
---
sound/soc/intel/boards/bxt_ivi_ull.c | 54 ++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/sound/soc/intel/boards/bxt_ivi_ull.c b/sound/soc/intel/boards/bxt_ivi_ull.c
index ba5293d051b9..91baeb7f81e3 100644
--- a/sound/soc/intel/boards/bxt_ivi_ull.c
+++ b/sound/soc/intel/boards/bxt_ivi_ull.c
@@ -95,6 +95,60 @@ static const struct snd_soc_dapm_route bxtp_ull_map[] = {
/* broxton digital audio interface glue - connects codec <--> CPU */
static struct snd_soc_dai_link bxtp_ull_dais[] = {
+ {
+ .name = "Bxt Audio Port 3",
+ .stream_name = "Stereo-16K SSP4",
+ .cpu_dai_name = "System Pin 3",
+ .platform_name = "0000:00:0e.0",
+ .nonatomic = 1,
+ .dynamic = 1,
+ .codec_name = "snd-soc-dummy",
+ .codec_dai_name = "snd-soc-dummy-dai",
+ .trigger = {SND_SOC_DPCM_TRIGGER_POST,
+ SND_SOC_DPCM_TRIGGER_POST},
+ .dpcm_playback = 1,
+ .dpcm_capture = 1,
+ },
+ {
+ .name = "Bxt Audio Port 4",
+ .stream_name = "5-ch SSP1",
+ .cpu_dai_name = "System Pin 4",
+ .platform_name = "0000:00:0e.0",
+ .nonatomic = 1,
+ .dynamic = 1,
+ .codec_name = "snd-soc-dummy",
+ .codec_dai_name = "snd-soc-dummy-dai",
+ .trigger = {SND_SOC_DPCM_TRIGGER_POST,
+ SND_SOC_DPCM_TRIGGER_POST},
+ .dpcm_playback = 1,
+ },
+ {
+ .name = "Bxt Audio Port 5",
+ .stream_name = "SSP2 Stream",
+ .cpu_dai_name = "System Pin 5",
+ .platform_name = "0000:00:0e.0",
+ .nonatomic = 1,
+ .dynamic = 1,
+ .codec_name = "snd-soc-dummy",
+ .codec_dai_name = "snd-soc-dummy-dai",
+ .trigger = {SND_SOC_DPCM_TRIGGER_POST,
+ SND_SOC_DPCM_TRIGGER_POST},
+ .dpcm_playback = 1,
+ .dpcm_capture = 1,
+ },
+ {
+ .name = "Bxt Audio Port 6",
+ .stream_name = "8-Ch SSP0",
+ .cpu_dai_name = "System Pin 6",
+ .platform_name = "0000:00:0e.0",
+ .nonatomic = 1,
+ .dynamic = 1,
+ .codec_name = "snd-soc-dummy",
+ .codec_dai_name = "snd-soc-dummy-dai",
+ .trigger = {SND_SOC_DPCM_TRIGGER_POST,
+ SND_SOC_DPCM_TRIGGER_POST},
+ .dpcm_capture = 1,
+ },
/* Probe DAI Links */
{
.name = "Bxt Compress Probe playback",
--
2.17.1

133
0883-ASoC-Intel-board-Update-BXT-P-ULL-machine-d.patch Normal file
View File

@ -0,0 +1,133 @@
From 1e80deeca5a63aee2894a961b81003f0bf24974d Mon Sep 17 00:00:00 2001
From: Adam Wulw <adam.wulw@intel.com>
Date: Fri, 9 Nov 2018 10:00:09 +0100
Subject: [PATCH 3/5] ASoC: Intel: board: Update BXT-P ULL machine driver to
kernel 4.19
Change also SSP4 to SSP3 according to ull topology.
Change-Id: I1535aead777ead9ad1e993d872f69c2ee6315cb7
Signed-off-by: Adam Wulw <adam.wulw@intel.com>
Signed-off-by: Szymon Mielczarek <szymonx.mielczarek@intel.com>
Tracked-On: OAM-72117
Reviewed-by: Lewandowski, Gustaw <gustaw.lewandowski@intel.com>
Tested-by: Bozek, DominikX <dominikx.bozek@intel.com>
---
sound/soc/intel/boards/bxt_ivi_ull.c | 60 +++++++++-------------------
1 file changed, 18 insertions(+), 42 deletions(-)
diff --git a/sound/soc/intel/boards/bxt_ivi_ull.c b/sound/soc/intel/boards/bxt_ivi_ull.c
index 91baeb7f81e3..9b4ee6335824 100644
--- a/sound/soc/intel/boards/bxt_ivi_ull.c
+++ b/sound/soc/intel/boards/bxt_ivi_ull.c
@@ -36,14 +36,6 @@ static const struct snd_soc_pcm_stream codec1_in_params = {
.channels_max = 6,
};
-static const struct snd_soc_pcm_stream codec0_in_params = {
- .formats = SNDRV_PCM_FMTBIT_S32_LE,
- .rate_min = 48000,
- .rate_max = 48000,
- .channels_min = 1,
- .channels_max = 1,
-};
-
static const struct snd_soc_dapm_widget broxton_widgets[] = {
SND_SOC_DAPM_SPK("DummySpeaker1", NULL),
SND_SOC_DAPM_SPK("DummySpeaker2", NULL),
@@ -59,37 +51,33 @@ static const struct snd_soc_dapm_route bxtp_ull_map[] = {
{"ssp0 Rx", NULL, "Dummy Capture" },
{"Dummy Capture", NULL, "DummyMIC0"},
- {"DummySpeaker2", NULL, "Dummy Playback2"},
- {"Dummy Playback2", NULL, "ssp2 Tx"},
+ {"DummySpeaker2", NULL, "Dummy Playback"},
+ {"Dummy Playback", NULL, "ssp2 Tx"},
{"ssp2 Tx", NULL, "8ch_pt_out2"},
- {"DummySpeaker1", NULL, "Dummy Playback1"},
- {"Dummy Playback1", NULL, "ssp1 Tx"},
+ {"DummySpeaker1", NULL, "Dummy Playback"},
+ {"Dummy Playback", NULL, "ssp1 Tx"},
{"ssp1 Tx", NULL, "8ch_pt_out3"},
{"8ch_pt_in2", NULL, "ssp2 Rx" },
- {"ssp2 Rx", NULL, "Dummy Capture2" },
- {"Dummy Capture2", NULL, "DummyMIC2"},
+ {"ssp2 Rx", NULL, "Dummy Capture" },
+ {"Dummy Capture", NULL, "DummyMIC2"},
- {"DummySpeaker4", NULL, "Dummy Playback4"},
- {"Dummy Playback4", NULL, "ssp4 Tx"},
- {"ssp4 Tx", NULL, "8ch_pt_out"},
+ {"DummySpeaker4", NULL, "Dummy Playback"},
+ {"Dummy Playback", NULL, "ssp3 Tx"},
+ {"ssp3 Tx", NULL, "8ch_pt_out"},
- {"8ch_pt_in", NULL, "ssp4 Rx" },
- {"ssp4 Rx", NULL, "Dummy Capture4" },
- {"Dummy Capture4", NULL, "DummyMIC4"},
+ {"8ch_pt_in", NULL, "ssp3 Rx" },
+ {"ssp3 Rx", NULL, "Dummy Capture" },
+ {"Dummy Capture", NULL, "DummyMIC4"},
/* (ANC) Codec1_in - Loop pipe */
{ "codec1_in", NULL, "ssp0-b Rx" },
{ "ssp0-b Rx", NULL, "Dummy Capture" },
- /* Codec0_in - Loop pipe */
- { "codec0_in", NULL, "ssp2-b Rx" },
- { "ssp2-b Rx", NULL, "Dummy Capture2" },
-
/* Media1_out Loop Path */
- {"DummySpeaker3", NULL, "Dummy Playback3"},
- { "Dummy Playback3", NULL, "ssp1-b Tx"},
+ {"DummySpeaker3", NULL, "Dummy Playback"},
+ { "Dummy Playback", NULL, "ssp1-b Tx"},
{ "ssp1-b Tx", NULL, "media1_out"},
};
@@ -97,7 +85,7 @@ static const struct snd_soc_dapm_route bxtp_ull_map[] = {
static struct snd_soc_dai_link bxtp_ull_dais[] = {
{
.name = "Bxt Audio Port 3",
- .stream_name = "Stereo-16K SSP4",
+ .stream_name = "Stereo-16K SSP3",
.cpu_dai_name = "System Pin 3",
.platform_name = "0000:00:0e.0",
.nonatomic = 1,
@@ -202,18 +190,6 @@ static struct snd_soc_dai_link bxtp_ull_dais[] = {
.params = &codec1_in_params,
.dsp_loopback = true,
},
-
- {
- .name = "Bxtn SSP2 port",
- .stream_name = "Bxtn SSP2",
- .cpu_dai_name = "SSP2-B Pin",
- .platform_name = "0000:00:0e.0",
- .codec_name = "snd-soc-dummy",
- .codec_dai_name = "snd-soc-dummy-dai",
- .params = &codec0_in_params,
- .dsp_loopback = true,
- },
-
{
.name = "Bxtn SSP1 port",
.stream_name = "Bxtn SSP2",
@@ -227,9 +203,9 @@ static struct snd_soc_dai_link bxtp_ull_dais[] = {
/* Back End DAI links */
{
- /* SSP4 - Codec */
- .name = "SSP4-Codec",
- .cpu_dai_name = "SSP4 Pin",
+ /* SSP3 - Codec */
+ .name = "SSP3-Codec",
+ .cpu_dai_name = "SSP3 Pin",
.platform_name = "0000:00:0e.0",
.no_pcm = 1,
.codec_name = "snd-soc-dummy",
--
2.17.1

52
0884-media-intel-ipu4-ICI-start-stream-with-corr.patch Normal file
View File

@ -0,0 +1,52 @@
From e102f78a18d6bfdbf9b469eb84c3a8de24f4047e Mon Sep 17 00:00:00 2001
From: "Yin, Zhiye" <zhiyex.yin@intel.com>
Date: Tue, 15 Jan 2019 09:55:42 +0800
Subject: [PATCH 4/5] media: intel-ipu4: [ICI] start stream with correct
parameters
Low brightness of first few frames if start stream without css
paramerters, lead to Camera CTS failure
android.hardware.camera2.cts.AllocationTest#testAllocationFromCameraFlexibleYuv
Change-Id: Ie9b608d0947c44c7b8a09476360c09628d1c9bac
Tracked-On: OAM-72077
Tracked-On: PKT-1686
Signed-off-by: Yin, Zhiye <zhiyex.yin@intel.com>
---
drivers/media/pci/intel/ici/ici-isys-frame-buf.c | 6 ++++++
drivers/media/pci/intel/ici/ici-isys-stream.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/media/pci/intel/ici/ici-isys-frame-buf.c b/drivers/media/pci/intel/ici/ici-isys-frame-buf.c
index ff497f8fdd5e..39f3ad39aefc 100644
--- a/drivers/media/pci/intel/ici/ici-isys-frame-buf.c
+++ b/drivers/media/pci/intel/ici/ici-isys-frame-buf.c
@@ -830,6 +830,12 @@ int ici_isys_frame_buf_add_next(
buf->frame_info.frame_planes[0].mem.userptr);
css_buf->send_irq_sof = 1;
+ css_buf->send_resp_sof = 1;
+ css_buf->send_irq_eof = 1;
+ css_buf->send_resp_eof = 1;
+ css_buf->send_irq_capture_ack = 1;
+ css_buf->send_irq_capture_done = 1;
+
css_buf->output_pins[buf_list->fw_output].addr =
(uint32_t)buf->kframe_info.planes[0].dma_addr;
css_buf->output_pins[buf_list->fw_output].out_buf_id =
diff --git a/drivers/media/pci/intel/ici/ici-isys-stream.c b/drivers/media/pci/intel/ici/ici-isys-stream.c
index 33fec29e6ad1..f5b6e3964ec2 100644
--- a/drivers/media/pci/intel/ici/ici-isys-stream.c
+++ b/drivers/media/pci/intel/ici/ici-isys-stream.c
@@ -545,7 +545,7 @@ static int start_stream_firmware(struct ici_isys_stream *as)
reinit_completion(&ip->stream_start_completion);
rval = ipu_lib_call(stream_start, as->isys, ip->stream_handle,
- NULL);
+ &css_buf);
if (rval < 0) {
dev_err(dev, "can't start streaming (%d)\n", rval);
goto out_stream_close;
--
2.17.1

36
0885-media-intel-ipu4-ICI-Reorder-mutex-lock-of-.patch Normal file
View File

@ -0,0 +1,36 @@
From f16d097115d79538253c30e50d1cfbe821131873 Mon Sep 17 00:00:00 2001
From: "Yew, Chang Ching" <chang.ching.yew@intel.com>
Date: Thu, 17 Jan 2019 09:30:03 +0800
Subject: [PATCH 5/5] media: intel-ipu4: [ICI] Reorder mutex lock of ipu css
for isys close
Cannot take mutex lock within a spinlock
Change-Id: I9f80b32f62ff3fcce3498c00479b6a2da7590feb
Tracked-On: OAM-72077
Tracked-On: PKT-1686
Signed-off-by: Yew, Chang Ching <chang.ching.yew@intel.com>
---
drivers/media/pci/intel/ici/libintel-ipu4_ici.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/media/pci/intel/ici/libintel-ipu4_ici.c b/drivers/media/pci/intel/ici/libintel-ipu4_ici.c
index 68584377548d..bb226d70f853 100644
--- a/drivers/media/pci/intel/ici/libintel-ipu4_ici.c
+++ b/drivers/media/pci/intel/ici/libintel-ipu4_ici.c
@@ -56,9 +56,11 @@ int ici_fw_isys_close(struct ici_isys *isys)
* some time as the FW must stop its actions including code fetch
* to SP icache.
*/
+ mutex_lock(&isys->lib_mutex);
spin_lock_irqsave(&isys->power_lock, flags);
- rval = ipu_lib_call(device_close, isys);
+ rval = ipu_lib_call_notrace_unlocked(device_close, isys);
spin_unlock_irqrestore(&isys->power_lock, flags);
+ mutex_unlock(&isys->lib_mutex);
if (rval)
dev_err(dev, "Device close failure: %d\n", rval);
--
2.17.1

11
config-iot-lts2018-sos
View File

@ -485,7 +485,7 @@ CONFIG_PMIC_OPREGION=y
CONFIG_CRC_PMIC_OPREGION=y
CONFIG_BXT_WC_PMIC_OPREGION=y
# CONFIG_ACPI_CONFIGFS is not set
CONFIG_X86_PM_TIMER=y
# CONFIG_X86_PM_TIMER is not set
# CONFIG_SFI is not set
#
@ -3693,9 +3693,7 @@ CONFIG_DRM_MIPI_DSI=y
# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_KMS_HELPER=y
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=100
# CONFIG_DRM_FBDEV_EMULATION is not set
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
# CONFIG_DRM_DP_CEC is not set
CONFIG_DRM_TTM=y
@ -3778,12 +3776,7 @@ CONFIG_FB_BOOT_VESA_SUPPORT=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
CONFIG_FB_SYS_FILLRECT=y
CONFIG_FB_SYS_COPYAREA=y
CONFIG_FB_SYS_IMAGEBLIT=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=y
CONFIG_FB_DEFERRED_IO=y
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y

16
linux-iot-lts2018.spec
View File

@ -17,7 +17,7 @@ Name: linux-iot-lts2018
Version: 4.19.13
# Release number is the number from PKT it consist in
# YYMMDDHHMM a 10 length number
Release: 1901170915
Release: 1901182211
License: GPL-2.0
Summary: The Linux kernel
Url: http://www.kernel.org/
@ -31,8 +31,8 @@ Source5: fragment-sos
# quilt.url: https://github.com/intel/linux-intel-quilt
# quilt.branch: 4.19/base
# quilt.tag: lts-v4.19.13-base-190117T091501Z
# config.tag: lts-v4.19.13-base-190117T091501Z
# quilt.tag: lts-v4.19.13-base-190118T221148Z
# config.tag: lts-v4.19.13-base-190118T221148Z
%define ktarget0 iot-lts2018
%define kversion0 %{version}-%{release}.%{ktarget0}
@ -929,6 +929,11 @@ Patch0877: 0877-keystore-fix-missing-break.patch
Patch0878: 0878-keystore-add-application-authentication-fea.patch
Patch0879: 0879-Revert-drm-i915-Add-plane-alpha-blending-su.patch
Patch0880: 0880-Revert-drm-Add-per-plane-pixel-blend-mode-p.patch
Patch0881: 0881-ASoC-Intel-Skylake-Add-FE-and-BE-DAIs-for-U.patch
Patch0882: 0882-Revert-ASoC-Intel-board-Add-support-for-FE-.patch
Patch0883: 0883-ASoC-Intel-board-Update-BXT-P-ULL-machine-d.patch
Patch0884: 0884-media-intel-ipu4-ICI-start-stream-with-corr.patch
Patch0885: 0885-media-intel-ipu4-ICI-Reorder-mutex-lock-of-.patch
#END XXXX: PK Series
# Clear Linux Series
@ -1838,6 +1843,11 @@ Linux kernel extra files
%patch0878 -p1
%patch0879 -p1
%patch0880 -p1
%patch0881 -p1
%patch0882 -p1
%patch0883 -p1
%patch0884 -p1
%patch0885 -p1
# End XXXX PK Series
# Clear Linux Series

2
release
View File

@ -1 +1 @@
1901170915
1901182211