summaryrefslogtreecommitdiff
path: root/sm7150
diff options
context:
space:
mode:
authorCyan_Hsieh <cyanhsieh@google.com>2020-01-09 12:30:28 +0800
committerCyan_Hsieh <cyanhsieh@google.com>2020-01-09 12:30:40 +0800
commit51f8da9b3ff04db971c8a770c22aaa25ff81e4bc (patch)
tree2dad80362f357f9e1bc5ed4ead1de40c5d3ac4da /sm7150
parent3f101a289c6ec20f53c91c69754a03cce23252c3 (diff)
downloadsunfish-kernel-51f8da9b3ff04db971c8a770c22aaa25ff81e4bc.tar.gz
sunfish: update kernel-and-modules prebuilt
Linux version 4.14.117-g354f13153e7c-ab6121398 (android- build@wphs9.hot.corp.google.com) (Android (6051079 based on r370808) clang version 10.0.1 (https://android.googlesource.com/toolchain/llvm-project b9738d6d99f614c8bf7a3e7c769659b313b88244)) #1 SMP PREEMPT Thu Jan 9 03:56:08 UTC 2020 private/msm-google: (280 changes) 354f1315 Revert "mm: cma: make writeable CMA debugfs optional" c91c7404 Revert "mm: cma: restrict base_pfn exposure" 0efa8cd8 Revert "mm: memblock: Add more debug logs" 0e57d043 Revert "Create debugfs file node to dump IPA statistics" a1df75c8 Merge branch 'LA.UM.8.1.C9.09.00.00.518.370' via branch 'qcom-msm-4.14' into android-msm-sunfish-4.14 69e3e7e6 asoc: rt5514: modify control flow for 5514 DSP enable sequence d35912a6 Merge "msm: pcie: provide APIs to prevent and allow PCIe ASPM L1" 10a26ea4 Merge "mhi: cntrl: qcom: read power down state from boot monitor" c330f5fd Merge "mm: memblock: Add more debug logs" 83b66222 msm: pcie: provide APIs to prevent and allow PCIe ASPM L1 e864736d Merge "ARM: dts: sdxpoorwills: fix wsa device node" 2375af61 Merge "mhi: cntrl: qcom: schedule boot monitor thread conditionally" 3566156e mm: memblock: Add more debug logs b95867d2 Merge "msm: vidc: remove additional checks in response_handler" 6951e816 mhi: cntrl: qcom: read power down state from boot monitor 286a984e mhi: core: add a power down status to notify controller a460809b mhi: cntrl: qcom: schedule boot monitor thread conditionally 6404500c Merge "defconfig: Enable CONFIG_ARM_MODULE_PLTS config" 27f607c7 Merge "msm: ipa: eth: Perform refresh for devices under removal" 70c2b14c Merge "ARM: dts: msm: Enable SMMU S1 functionality with USB on SM8150" 0249dabb Merge "msm: npu: Don't poll status register if watchdog is triggered" f53eedae Merge "msm: npu: Use write memory barrier at the end of npu_mem_write" 6030cb1b Merge "msm: npu: Trigger SSR if RSC handshake times out" d9958656 Merge "devfreq: Compilation error fix for 32-bit kernel" 7dfef510 Merge "backlight: qcom-spmi-wled: Fix compilation error" 2da9719b Merge "qcom: cdsp: Compilation error fix for 32-bit kernel" 70c12922 Merge "mm: arm: Fix BUG() while do iova range checking" a3cb38f7 Merge "dev: unregister netdev after 10hz" 842045a8 Merge "msm: ice: Modify the waiting condition in suspend" 4150875d ARM: dts: msm: Enable SMMU S1 functionality with USB on SM8150 5c58baf7 Merge "Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14.c4 12/13" 9e1c3c0e Merge "msm: npu: Avoid buffer overflow while reading debugfs" 24defb3e Merge "ARM: dts: msm: Support SDIO on QCS405 sku12 platforms" e3f95054 Merge "ARM: dts: msm: Add PCIe switch support for AQC in sdxprairie" a9e9ea93 ARM: dts: sdxpoorwills: fix wsa device node 0ffd8eb1 ARM: dts: msm: Add PCIe switch support for AQC in sdxprairie 991b44d9 rq_stats: Compilation error fix for 32bit kernel f6c13057 dev: unregister netdev after 10hz 204925a3 msm: npu: Avoid buffer overflow while reading debugfs 836bff95 Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14.c4 12/13 9efd18b8 msm: vidc: remove additional checks in response_handler 30a5c340 mm: arm: Fix BUG() while do iova range checking 63c800ef backlight: qcom-spmi-wled: Fix compilation error 65c3afce qcom: cdsp: Compilation error fix for 32-bit kernel 278342de msm: ice: Modify the waiting condition in suspend e7ccf1d7 Merge "ARM: dts: msm: Add support for nt36672c cphy panel on atoll" 3b3a538d Merge "adreno_tz: Fix compilation errors for 32bit kernel" 0e9c17f1 Merge "uapi: sound: add new meta key to set TTP offset" 8b805203 ARM: dts: msm: Support SDIO on QCS405 sku12 platforms 88ee49f0 devfreq: Compilation error fix for 32-bit kernel a1681345 Merge "msm: mhi_dev: Split mhi and channel state update" 048e023f Merge "msm: mhi_dev: Wait for pending writes to complete" 33c243b9 msm: npu: Don't poll status register if watchdog is triggered 13a12213 msm: npu: Use write memory barrier at the end of npu_mem_write 9007a9b5 msm: npu: Trigger SSR if RSC handshake times out 6ac578d7 Merge "pinctrl: qcs405: use proper gpio function for i2s_1" f6135b60 Merge "msm: kgsl: Update GMU firmware version info for A618 GPU" 4f3a0958 Merge "mhi: core: Check for queued request instead of available request" 718af73e Merge "rmnet: Reduce synchronize_rcu calls" 73ae1047 ARM: dts: msm: Add support for nt36672c cphy panel on atoll 46f4fbee msm: mhi_dev: Split mhi and channel state update a88d93a2 Merge "msm: npu: Retry to read IPC queue if network commands time out" bdb8fed0 msm: mhi_dev: Wait for pending writes to complete bc95867b mhi: core: Check for queued request instead of available request 11481ec4 msm: npu: Retry to read IPC queue if network commands time out cd617e5e Merge "kernel: sound: update codec options with block size" 2ad806f1 Merge "msm: npu: Initial support NPU suspend/resume" 74f144c7 Merge "msm: npu: Add support to handle EPROBE defer" 87d2d82f Merge "msm: npu: Allocate buffer per client for register read" 98d11bbb Merge "msm: npu: Calculate the maximum performance mode properly" 94e22627 Merge "serial: msm_geni_serial: Reduce wait for transfer delay" d9980a7b Merge "serial: msm_geni_serial: Control RFR manually when RX aborts" e255fefc Merge "mhi: core: Force PM state to M0 while processing BW scaling event" 50baa3c0 Merge "ARM: dts: msm: Offline 1GB of 6GB DDR for Atoll" d62ed162 Merge "serial: msm_geni_serial: Do not check_transfers_inflight() post port_close" a27d1582 adreno_tz: Fix compilation errors for 32bit kernel a275f4a6 Merge "msm: adsprpc: Fix adsprpc info leak" 7a22811d Merge "msm: npu: Use different timeout for RSC and power up handshake" bba3e139 Merge "diag: Use file's private data to get pid of exiting process" daa0dfc1 Merge "soc: qcom: pil: Add IPC logging for PIL" 7cc5fbb4 msm: kgsl: Update GMU firmware version info for A618 GPU cc033aa4 serial: msm_geni_serial: Do not check_transfers_inflight() post port_close bd2e0422 msm: npu: Initial support NPU suspend/resume b435ed0f msm: npu: Add support to handle EPROBE defer 23480320 msm: npu: Allocate buffer per client for register read 2dbb6bf7 msm: npu: Support multiple commands concurrently ea08dadd msm: npu: Calculate the maximum performance mode properly b0b00161 msm: npu: Use different timeout for RSC and power up handshake 6fb6914f serial: msm_geni_serial: Reduce wait for transfer delay 0b74ee6b serial: msm_geni_serial: Control RFR manually when RX aborts 103f3aae soc: qcom: pil: Add IPC logging for PIL 189ac741 diag: Use file's private data to get pid of exiting process 7376b794 Merge "ARM: dts: msm: Add 32-bit DT Overlay support" e92e0ae2 Merge "devfreq: Vote for bus bandwidth needed for the BWMON clocks" 751c9a97 Merge "adreno_tz: Correct acc_relative_busy calculation" 0ff93927 pinctrl: qcs405: use proper gpio function for i2s_1 1f948dbd defconfig: Enable CONFIG_ARM_MODULE_PLTS config 35bb26d3 uapi: sound: add new meta key to set TTP offset 233c32e7 msm: adsprpc: Fix adsprpc info leak 868fb6c8 kernel: sound: update codec options with block size 5ecf7eca Merge "ARM: dts: msm: Vote for CDSP Bus before enabling the NPU BWMON clocks" 2a179600 Merge "ARM: gic-v3: Add Macro to get high priority interrupt" 8978a272 devfreq: Vote for bus bandwidth needed for the BWMON clocks df878540 ARM: dts: msm: Vote for CDSP Bus before enabling the NPU BWMON clocks bcdaeb08 Merge "ARM: dts: msm: Prevent double include of sdxprairie.dtsi" 935ac412 ARM: dts: msm: Prevent double include of sdxprairie.dtsi 3e0f3774 Merge "disp: msm: sde: Fix 32-bit compilation issues" 904e52ab Merge "dfc: Cache grants before flow is added" d6ed9c8f Merge "soc: qcom: dcc_v2: Add support for 32bit devices" 6243ff27 Merge "ARM: dts: msm: Disable defer regulator_disable() for atoll GPU SMMU" 93cb9b54 Merge "msm: camera: icp: Update clock debug option" into dev/msm-4.14-camx 362bd1d9 disp: msm: sde: Fix 32-bit compilation issues 2cd8b88c Merge "msm: vidc: fix memory leak when set color format" bf96b74b Merge "power: smb5-lib: fix DPDM regulator handling" f6c10a0d Merge "power: smb1390-psy: battery: Fix FCC threshold to disable slave CP" 874320da rmnet: Reduce synchronize_rcu calls 7ae54d21 dfc: Cache grants before flow is added d3a6c7f4 Merge "mhi: Allow ipc logging in perf build" 5b3163d8 ARM: dts: msm: Disable defer regulator_disable() for atoll GPU SMMU 0d0d89ec Merge "msm: ep_pcie: Add support for L1ss sleep/exit" 33662dbd msm: vidc: fix memory leak when set color format 70955411 adreno_tz: Correct acc_relative_busy calculation 5b9ef503 mhi: Allow ipc logging in perf build 50313a89 Merge "power: qpnp-smb5: Disable CP(s) as part of thermal mitigation" c353c5f4 Merge "msm: pcie: Add proper check before accessing variables" 47b32810 Merge "mink: handle error in local object response" 881f6715 power: smb5-lib: fix DPDM regulator handling 10e4a5ee power: smb1390-psy: battery: Fix FCC threshold to disable slave CP 6fc1d9f2 Merge "iommu/arm-smmu: Fix missing power off for TCU space in testbus handling" 81142a79 Merge "regulator: qpnp-amoled: Fix uninitialized variable warning" a3fbc3f6 msm: ep_pcie: Add support for L1ss sleep/exit bed3c753 msm-geni-serial: Add ipc logging for console uart 015f8085 msm: ipa: eth: Perform refresh for devices under removal f61f59c6 regulator: qpnp-amoled: Fix uninitialized variable warning 619ef779 soc: qcom: dcc_v2: Add support for 32bit devices 8f6b2e44 Merge "ARM: dts: msm: Change second radio WLAN_EN gpio" 64a9a5de Merge "Revert "ARM: dts: msm: Defer regulator disable for sdmmagpie GPU SMMU"" 988cc1bc power: qpnp-smb5: Disable CP(s) as part of thermal mitigation 061029eb msm: pcie: Add proper check before accessing variables db1beced mink: handle error in local object response 35cc9052 Merge "pinctrl: sdxprairie: Enable PDC mux usage for GPIO 64" 9cac9da8 Merge "Revert "defconfig: arm64: msm: Enable MSM_DEBUG_LAR_UNLOCK for QCS405 perf"" fe200134 Merge "defconfig: trinket: enable cma debugfs" b3615ac4 iommu/arm-smmu: Fix missing power off for TCU space in testbus handling ff360fb9 Merge "Minimizing the synchronize_rcu() calls in SSR code flow" 024621d5 Merge "dmaengine: gpi: Add support for 32-bit kernel" 9d0689d2 Merge "msm: vidc: add 32 bit support in video driver" 2cb0b24e Revert "defconfig: arm64: msm: Enable MSM_DEBUG_LAR_UNLOCK for QCS405 perf" 7698d9c5 Revert "ARM: dts: msm: Defer regulator disable for sdmmagpie GPU SMMU" 7792cd82 Merge "soc: qcom: dcc_v2: Add virtualization support for 32bit devices" b5690120 Merge "mtd: nand: Add support for MT29F8G08ADBFA" 28315181 Merge "arm64 : dts: enable gpio115 for action key on qcs405" 2377efca Merge "mmc: sdhci-msm: Fix mmc card stuck issue for sanitize cmd" f2638ad1 Merge "iommu/arm-smmu: enhance tlb sync timeout handler" 50ca3d30 pinctrl: sdxprairie: Enable PDC mux usage for GPIO 64 5a583f0a defconfig: trinket: enable cma debugfs 638559aa defconfig: atoll: enable cma debugfs 94c4cbe3 defconfig: sdmsteppe: enable cma debugfs fd51bebc mm: cma: restrict base_pfn exposure 05eb03ab mm: cma: make writeable CMA debugfs optional ea85903a msm: vidc: add 32 bit support in video driver 57b9e2b4 dmaengine: gpi: Add support for 32-bit kernel adee15be dmaengine: gpi: Capture GPI hardware status during GSI General interrupt dd104704 mmc: sdhci-msm: Fix mmc card stuck issue for sanitize cmd 6d240d6b mtd: nand: Add support for MT29F8G08ADBFA b1d39b55 Merge "usb: dwc3: Avoid processing of TRB if HWO bit is set" 8db6b303 ARM: dts: msm: Change second radio WLAN_EN gpio 92729c1e Merge "msm: kgsl: Update CCU clock gating setting for A615" eaa30d6d Merge "ARM: dts: msm: Fix to disable IPA node for atollp" cb6c642d Merge "Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14.c4 11/26" e6bede9a Merge "msm: ipa3: Fix to avoid memory out of bound access error" 9c88e463 Merge "msm: ipa: eth: Use L2_802_1Q IPA header type in VLAN mode" 2e9b589e Merge "net: qualcomm: rmnet: Add UL packet prioritization" 5b3fd7dc Minimizing the synchronize_rcu() calls in SSR code flow 9a26edd2 msm: ipa3: Fix to avoid memory out of bound access error 62b100db iommu/arm-smmu: enhance tlb sync timeout handler 72b74925 mhi: core: Force PM state to M0 while processing BW scaling event dbcd6322 usb: dwc3: Avoid processing of TRB if HWO bit is set 12852aea Merge "dma-removed: update copyright" 83a529ee dma-removed: update copyright 3d69ebc6 Merge "AndroidKernel: For support 32-bit kernel compile" 2e212bf8 Merge "mhi: controller: Do not enable/disable L1 from device side" 8cfc18f3 AndroidKernel: For support 32-bit kernel compile eed42fe2 ARM: dts: msm: Add 32-bit DT Overlay support 6c5c92fe ARM: msm: Add board config support for 32 bit trinket c9b7a091 ARM: gic-v3: Add Macro to get high priority interrupt 058f7291 Merge "ARM: dts: msm: Increase size of event ring 6 on msmnile" b0b55ea5 soc: qcom: dcc_v2: Add virtualization support for 32bit devices 7d751a61 mhi: controller: Do not enable/disable L1 from device side b1238c64 mhi: core: Handle RSC minimum credit requirement 1c1dab80 ARM: dts: msm: Increase size of event ring 6 on msmnile c9cad70a Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14.c4 11/26 6d7b0b9a Merge "power: battery: cleanup FCC stepper flow to handle override votes" a3bae498 ARM: dts: msm: Fix to disable IPA node for atollp 36a77ed6 msm: kgsl: Update CCU clock gating setting for A615 8459262e Merge "ARM: dts: msm: Update chip wake up registers for atoll ab variants" 5dee92b7 ARM: dts: msm: Update chip wake up registers for atoll ab variants d180bd76 Merge "msm: camera: isp: Add debug status register data for VFE 175_130 hw" into dev/msm-4.14-camx 559a2e5c Merge "msm: ipa3: Fix to avoid buffer overread" aa45b1be Merge "mhi: core: Log time sync only in mission mode transition" 75870991 Merge "msm: kgsl: Update A618 GMU firmware to v1.08" 84030aca power: battery: cleanup FCC stepper flow to handle override votes c89a910a Merge "power: qpnp-smb5: Add support to boot up with a DAM cable" ae98a209 Merge "msm: ipa: add support to updated wdi3 scratch register2 alone" 698f8a1f mhi: core: Log time sync only in mission mode transition 28c09501 power: qpnp-smb5: Add support to boot up with a DAM cable 0c0ab9ee Merge "tmc-etr: Correct the arguments of CS_LOCK" 5531f6cf Merge "qdss_bridge : Release entry in success/failure cases of usb write" ad08d06c Merge "power: smb5-lib: Report smb_health based on CP status" a898be63 Merge "ARM: dts: msm: Add WLAN PD auxilary minidump ID for sdmmagpie" 7806df39 arm64 : dts: enable gpio115 for action key on qcs405 a4b3e259 ARM: dts: msm: Add WLAN PD auxilary minidump ID for sdmmagpie 215b2277 ARM: dts: msm: Add WLAN PD auxilary minidump ID for MSS on SM6150 4a751b73 msm: kgsl: Update A618 GMU firmware to v1.08 5c655f2f Merge "ARM: dts: msm: Expose conn_therm from ADC_TM for atoll" eb4a1b91 ARM: dts: msm: Add support for various platforms on atoll-ab f49a455f qdss_bridge : Release entry in success/failure cases of usb write 87b01186 ARM: dts: msm: Offline 1GB of 6GB DDR for Atoll e5907c1b power: smb5-lib: Report smb_health based on CP status 2a6fe3cd ARM: dts: msm: Expose conn_therm from ADC_TM for atoll be41b6f8 Merge "msm: npu: Add more error logs to retrieve network info" fb1cd223 Merge "ARM: dts: msm: Update sdxprairie CDP CPE 1.1 to CPE memory map V3" c0e0f892 Merge "ARM: dts: msm: add support for chitwan MHI device" a32902f2 Merge "soc: qcom: Add support for atoll-ab into socinfo driver" 66c232da tmc-etr: Correct the arguments of CS_LOCK baa4ed74 ARM: dts: msm: Enable force stop notification from HLOS to npu 30e96e09 ARM: dts: msm: Update sdxprairie CDP CPE 1.1 to CPE memory map V3 b0d4c00a ARM: dts: msm: Update sdxprairie CDP CPE to CPE memory map V3 a47678ce Merge "msm: wlan: update db.txt for WLAN" 272a17cf Merge "diag: Release diag wakesource on socket error" 451f7e8c Merge "ARM: dts: msm: Add ssctl-id and smem-id for NPU ss in atoll" fe1796a4 msm: npu: Add more error logs to retrieve network info a904bc57 ARM: dts: msm: Add ssctl-id and smem-id for NPU ss in atoll 6d2ed2da soc: qcom: Add support for atoll-ab into socinfo driver 08db3b27 msm: wlan: update db.txt for WLAN 25c4776b Merge "diag: Free the mask update client buf in exit case" 70d18819 Merge "ARM: dts: Add 750MHz GPU clock support for atoll" 47d8c99b Merge "ARM: dts: msm: Vote for CDSP Bus before enabling the NPU BWMON clocks" d50c9724 Merge "ARM: dts: msm: Update to CPE memory map V3 for sdxprairie CPE 1.1 V2" 33d7b0a8 Merge "ARM: dts: msm: remove PMIC PMXPRAIRIE GPIO 10 support" e56a26e6 Merge "arm64: mm: Support setting removed_dma_ops in arch_setup_dma_ops" 88de9f6a Merge "adsprpc: use uint for counters and maintain consistency in datatypes" 794a643a Merge "usb: pd: Prevent sending accept for DR_SWAP after timeout" 474b54a1 Merge "msm: kgsl: Dump always ON counter in adreno_irq_handler()" 5ea78b45 Merge "clk: qcom: gpucc: Add support for new frequency for GFX3D clock" a61f618f diag: Release diag wakesource on socket error 5f271189 msm: ipa: add support to updated wdi3 scratch register2 alone 83e36b48 ARM: dts: msm: Update to CPE memory map V3 for sdxprairie CPE 1.1 V2 88cdd9bd msm: ipa: eth: Use L2_802_1Q IPA header type in VLAN mode d187f579 ARM: dts: msm: Vote for CDSP Bus before enabling the NPU BWMON clocks daa2e940 Merge "net: stmmac: Fix build errors in dwmac-qcom-pps.c" a75a3506 Merge "msm: ipa3: SRAM NAT, DDR NAT, back-and-forth NAT" e18550a9 Merge "soc: qcom: wda: Conditionally register for dl marker" b42cf1de Merge "net: usb: ax88179: Change to check if the packets are coming from gsb" f75e8b5e Merge "ANDROID: overlayfs: internal getxattr operations without sepolicy checking" b7272170 ARM: dts: Add 750MHz GPU clock support for atoll ef16b70e net: usb: ax88179: Change to check if the packets are coming from gsb a02b80fc ANDROID: overlayfs: internal getxattr operations without sepolicy checking f1a77a56 ANDROID: overlayfs: add __get xattr method b66c5fa6 ANDROID: Add optional __get xattr method paired to __vfs_getxattr 591b6477 diag: Free the mask update client buf in exit case 90954a76 adsprpc: use uint for counters and maintain consistency in datatypes 4f161264 usb: pd: Prevent sending accept for DR_SWAP after timeout 05b3ec7b arm64: mm: Support setting removed_dma_ops in arch_setup_dma_ops 7559a15c ARM: dts: msm: remove PMIC PMXPRAIRIE GPIO 10 support 14bc6661 msm: ipa3: Fix to avoid buffer overread d1e97f4b soc: qcom: wda: Conditionally register for dl marker f5c184e1 net: stmmac: Fix build errors in dwmac-qcom-pps.c c093b4d0 msm: camera: isp: Add debug status register data for VFE 175_130 hw 48c97e51 msm: ipa3: SRAM NAT, DDR NAT, back-and-forth NAT 12a49d05 msm: kgsl: Dump always ON counter in adreno_irq_handler() 08eec842 Merge "msm: camera: isp: report last buf done req for rdi and fs2" into dev/msm-4.14-camx 88492355 clk: qcom: gpucc: Add support for new frequency for GFX3D clock 36677c36 Merge "msm: camera: isp: Opimitize handling of CSID error dumping" into dev/msm-4.14-camx fe424e73 msm: camera: isp: Opimitize handling of CSID error dumping 2f2b98eb ARM: dts: msm: add support for chitwan MHI device cc23f7fb mhi: cntrl: qcom: add support for chitwan device 6ab87573 msm: camera: icp: Update clock debug option 4310720f msm: camera: isp: report last buf done req for rdi and fs2 38bbccdc net: qualcomm: rmnet: Add UL packet prioritization private/msm-google-modules/data-kernel: (16 changes) a92a4f00 Merge branch 'LA.UM.8.1.C9.09.00.00.518.370' via branch 'qcom-msm-4.14' into android-msm-sunfish-4.14 1932a915 drivers: rmnet_perf: Avoid recursive spinlock in legacy mode 56901a4a drivers: rmnet_perf: Take lock during DL marker handling ec9e2100 data-kernel: EMAC: Check NAPI before calling netif_rx_skb ... 28364060 emac: Perf setting private/msm-google/techpack/audio: (11 changes) 1444ffa5 Merge branch 'LA.UM.8.1.C9.09.00.00.518.370' via branch 'qcom-msm-4.14' into android-msm-sunfish-4.14 9bd3522d asoc: msm-compress: Add missing mutex initialization for pdata a3640c08 Merge "asoc: Add support for Hifi resampler check with bitwidth and sample_rate" 1af567fc Merge "asoc: Add HiFi Filter support in driver" 2c702a93 asoc: Add support for Hifi resampler check with bitwidth and sample_rate 68c869b5 Merge "audio-kernel: Pull in latest code changes from 4.0 branch" 6043d6a7 Merge "asoc: sdm660: Add 16ch playback and record support for TDM" b00e4a8e asoc: Add HiFi Filter support in driver dfd3a2ea audio-kernel: Pull in latest code changes from 4.0 branch 8be6bc7a asoc: sdm660: Add 16ch playback and record support for TDM 7bf3b0bb asoc: routing: Fix CDC_DMA_RX_1 routing to SLIM_8_TX for loopback Bug: 129319403 Bug: 133515582 Bug: 136124883 Bug: 146828034 Bug: 146885139 Bug: 146991028 Bug: 146997517 Bug: 147022879 Bug: 147076093 Change-Id: I89b14dfb2c9bf2964a185604c9cc4e8c3a48ef36 Pick-Prebuilt: 285227204 Build-Id: 6121398 Processing-Config: kernel_headers Signed-off-by: Cyan_Hsieh <cyanhsieh@google.com>
Diffstat (limited to 'sm7150')
-rw-r--r--sm7150/kernel-headers/linux/msm_npu.h4
-rw-r--r--sm7150/kernel-headers/sound/compress_offload.h2
-rw-r--r--sm7150/kernel-headers/sound/compress_params.h4
-rw-r--r--sm7150/original-kernel-headers/linux/msm_npu.h5
-rw-r--r--sm7150/original-kernel-headers/sound/compress_offload.h2
-rw-r--r--sm7150/original-kernel-headers/sound/compress_params.h8
6 files changed, 25 insertions, 0 deletions
diff --git a/sm7150/kernel-headers/linux/msm_npu.h b/sm7150/kernel-headers/linux/msm_npu.h
index 2b8cc2f70..4e4612b59 100644
--- a/sm7150/kernel-headers/linux/msm_npu.h
+++ b/sm7150/kernel-headers/linux/msm_npu.h
@@ -44,12 +44,16 @@
#define MSM_NPU_PROP_ID_PERF_MODE_MAX (MSM_NPU_PROP_ID_START + 2)
#define MSM_NPU_PROP_ID_DRV_VERSION (MSM_NPU_PROP_ID_START + 3)
#define MSM_NPU_PROP_ID_HARDWARE_VERSION (MSM_NPU_PROP_ID_START + 4)
+#define MSM_NPU_PROP_ID_IPC_QUEUE_INFO (MSM_NPU_PROP_ID_START + 5)
+#define MSM_NPU_PROP_ID_DRV_FEATURE (MSM_NPU_PROP_ID_START + 6)
#define MSM_NPU_FW_PROP_ID_START 0x1000
#define MSM_NPU_PROP_ID_DCVS_MODE (MSM_NPU_FW_PROP_ID_START + 0)
#define MSM_NPU_PROP_ID_DCVS_MODE_MAX (MSM_NPU_FW_PROP_ID_START + 1)
#define MSM_NPU_PROP_ID_CLK_GATING_MODE (MSM_NPU_FW_PROP_ID_START + 2)
#define MSM_NPU_PROP_ID_HW_VERSION (MSM_NPU_FW_PROP_ID_START + 3)
#define MSM_NPU_PROP_ID_FW_VERSION (MSM_NPU_FW_PROP_ID_START + 4)
+#define MSM_NPU_FEATURE_MULTI_EXECUTE 0x1
+#define MSM_NPU_FEATURE_ASYNC_EXECUTE 0x2
#define PROP_PARAM_MAX_SIZE 8
struct msm_npu_patch_info {
uint32_t chunk_id;
diff --git a/sm7150/kernel-headers/sound/compress_offload.h b/sm7150/kernel-headers/sound/compress_offload.h
index e528222f9..853dcc4fc 100644
--- a/sm7150/kernel-headers/sound/compress_offload.h
+++ b/sm7150/kernel-headers/sound/compress_offload.h
@@ -88,6 +88,7 @@ enum sndrv_compress_encoder {
SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK = 10,
SNDRV_COMPRESS_ADJUST_SESSION_CLOCK = 11,
SNDRV_COMPRESS_LATENCY_MODE = 12,
+ SNDRV_COMPRESS_IN_TTP_OFFSET = 13,
};
#define SNDRV_COMPRESS_MIN_BLK_SIZE SNDRV_COMPRESS_MIN_BLK_SIZE
#define SNDRV_COMPRESS_MAX_BLK_SIZE SNDRV_COMPRESS_MAX_BLK_SIZE
@@ -99,6 +100,7 @@ enum sndrv_compress_encoder {
#define SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK
#define SNDRV_COMPRESS_ADJUST_SESSION_CLOCK SNDRV_COMPRESS_ADJUST_SESSION_CLOCK
#define SNDRV_COMPRESS_LATENCY_MODE SNDRV_COMPRESS_LATENCY_MODE
+#define SNDRV_COMPRESS_IN_TTP_OFFSET SNDRV_COMPRESS_IN_TTP_OFFSET
struct snd_compr_metadata {
__u32 key;
__u32 value[8];
diff --git a/sm7150/kernel-headers/sound/compress_params.h b/sm7150/kernel-headers/sound/compress_params.h
index f4c02b4ce..e951bea4f 100644
--- a/sm7150/kernel-headers/sound/compress_params.h
+++ b/sm7150/kernel-headers/sound/compress_params.h
@@ -250,6 +250,9 @@ struct snd_dec_aptx {
__u32 uap;
__u32 nap;
};
+struct snd_dec_dsd {
+ __u32 blk_size;
+};
struct snd_dec_pcm {
__u32 num_channels;
__u8 ch_map[MAX_PCM_DECODE_CHANNELS];
@@ -272,6 +275,7 @@ union snd_codec_options {
struct snd_dec_thd truehd;
struct snd_dec_pcm pcm_dec;
struct snd_dec_amrwb_plus amrwbplus;
+ struct snd_dec_dsd dsd_dec;
};
struct snd_codec_desc {
__u32 max_ch;
diff --git a/sm7150/original-kernel-headers/linux/msm_npu.h b/sm7150/original-kernel-headers/linux/msm_npu.h
index 2f956cd08..594f1fa3b 100644
--- a/sm7150/original-kernel-headers/linux/msm_npu.h
+++ b/sm7150/original-kernel-headers/linux/msm_npu.h
@@ -73,6 +73,8 @@
#define MSM_NPU_PROP_ID_PERF_MODE_MAX (MSM_NPU_PROP_ID_START + 2)
#define MSM_NPU_PROP_ID_DRV_VERSION (MSM_NPU_PROP_ID_START + 3)
#define MSM_NPU_PROP_ID_HARDWARE_VERSION (MSM_NPU_PROP_ID_START + 4)
+#define MSM_NPU_PROP_ID_IPC_QUEUE_INFO (MSM_NPU_PROP_ID_START + 5)
+#define MSM_NPU_PROP_ID_DRV_FEATURE (MSM_NPU_PROP_ID_START + 6)
#define MSM_NPU_FW_PROP_ID_START 0x1000
#define MSM_NPU_PROP_ID_DCVS_MODE (MSM_NPU_FW_PROP_ID_START + 0)
@@ -81,6 +83,9 @@
#define MSM_NPU_PROP_ID_HW_VERSION (MSM_NPU_FW_PROP_ID_START + 3)
#define MSM_NPU_PROP_ID_FW_VERSION (MSM_NPU_FW_PROP_ID_START + 4)
+/* features supported by driver */
+#define MSM_NPU_FEATURE_MULTI_EXECUTE 0x1
+#define MSM_NPU_FEATURE_ASYNC_EXECUTE 0x2
#define PROP_PARAM_MAX_SIZE 8
diff --git a/sm7150/original-kernel-headers/sound/compress_offload.h b/sm7150/original-kernel-headers/sound/compress_offload.h
index 8d1a5bb26..e83c4185a 100644
--- a/sm7150/original-kernel-headers/sound/compress_offload.h
+++ b/sm7150/original-kernel-headers/sound/compress_offload.h
@@ -173,6 +173,7 @@ enum sndrv_compress_encoder {
SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK = 10,
SNDRV_COMPRESS_ADJUST_SESSION_CLOCK = 11,
SNDRV_COMPRESS_LATENCY_MODE = 12,
+ SNDRV_COMPRESS_IN_TTP_OFFSET = 13,
};
#define SNDRV_COMPRESS_MIN_BLK_SIZE SNDRV_COMPRESS_MIN_BLK_SIZE
@@ -186,6 +187,7 @@ enum sndrv_compress_encoder {
SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK
#define SNDRV_COMPRESS_ADJUST_SESSION_CLOCK SNDRV_COMPRESS_ADJUST_SESSION_CLOCK
#define SNDRV_COMPRESS_LATENCY_MODE SNDRV_COMPRESS_LATENCY_MODE
+#define SNDRV_COMPRESS_IN_TTP_OFFSET SNDRV_COMPRESS_IN_TTP_OFFSET
/**
* struct snd_compr_metadata - compressed stream metadata
diff --git a/sm7150/original-kernel-headers/sound/compress_params.h b/sm7150/original-kernel-headers/sound/compress_params.h
index a9f8cc24a..ac164e037 100644
--- a/sm7150/original-kernel-headers/sound/compress_params.h
+++ b/sm7150/original-kernel-headers/sound/compress_params.h
@@ -424,6 +424,13 @@ struct snd_dec_aptx {
__u32 nap;
};
+/** struct snd_dec_dsd - codec for DSD format
+ * @blk_size - dsd channel block size
+ */
+struct snd_dec_dsd {
+ __u32 blk_size;
+};
+
/** struct snd_dec_pcm - codec options for PCM format
* @num_channels: Number of channels
* @ch_map: Channel map for the above corresponding channels
@@ -452,6 +459,7 @@ union snd_codec_options {
struct snd_dec_thd truehd;
struct snd_dec_pcm pcm_dec;
struct snd_dec_amrwb_plus amrwbplus;
+ struct snd_dec_dsd dsd_dec;
};
/** struct snd_codec_desc - description of codec capabilities