device-qcom-msm89x7: new device (MR 5693)
Replace xiaomi-riva and xiaomi-santoni device package with this generic package. [ci:skip-vercheck] [ci:skip-build]: already built successfully in CI
This commit is contained in:
Barnabás Czémán
@@ -0,0 +1,38 @@
|
||||
# Maintainer: Barnabas Czeman <barnabas.czeman@postmarketos.org>
|
||||
# Reference: <https://postmarketos.org/devicepkg>
|
||||
pkgname=device-qcom-msm89x7
|
||||
pkgdesc="Generic device package for various Qualcomm MSM8917/MSM8937/MSM8940-based devices"
|
||||
pkgver=1
|
||||
pkgrel=0
|
||||
url="https://postmarketos.org"
|
||||
license="MIT"
|
||||
arch="aarch64"
|
||||
options="!check !archcheck"
|
||||
depends="
|
||||
firmware-qcom-adreno-a300
|
||||
firmware-qcom-adreno-a530
|
||||
linux-postmarketos-qcom-msm89x7
|
||||
lk2nd-msm8952
|
||||
mkbootimg
|
||||
msm-firmware-loader
|
||||
postmarketos-base
|
||||
soc-qcom-msm89x7
|
||||
"
|
||||
makedepends="devicepkg-dev"
|
||||
source="
|
||||
deviceinfo
|
||||
modules-initfs
|
||||
"
|
||||
|
||||
build() {
|
||||
devicepkg_build $startdir $pkgname
|
||||
}
|
||||
|
||||
package() {
|
||||
devicepkg_package $startdir $pkgname
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
525fb2e6cc7fc01d6a8bd0d1e865b0d038de7294a6824661cb564afaafb37af0bd1bbf96c48c22e72aa4502c19e9f5167e411653a9eb7989dbf54e07fd49ea7c deviceinfo
|
||||
8f0e17ddcbbb7421c5ebb78c2342d636b58301a842d488f50c48470399a5d96e6ed7bd0958c2b8a5eb34856209bac210476b1d379a5a6536ea2523dab7f793ff modules-initfs
|
||||
"
|
||||
@@ -0,0 +1,25 @@
|
||||
# Reference: <https://postmarketos.org/deviceinfo>
|
||||
# Please use double quotes only. You can source this file in shell
|
||||
# scripts.
|
||||
|
||||
deviceinfo_format_version="0"
|
||||
deviceinfo_name="Qualcomm msm8937-based device"
|
||||
deviceinfo_manufacturer="Qualcomm"
|
||||
deviceinfo_codename="qcom-msm89x7"
|
||||
deviceinfo_year="2015"
|
||||
deviceinfo_arch="aarch64"
|
||||
|
||||
# Device related
|
||||
deviceinfo_gpu_accelerated="true"
|
||||
deviceinfo_chassis="embedded"
|
||||
deviceinfo_external_storage="true"
|
||||
deviceinfo_keyboard="false"
|
||||
|
||||
# Bootloader related
|
||||
deviceinfo_flash_method="fastboot"
|
||||
deviceinfo_partition_type="msdos"
|
||||
|
||||
# extlinux.conf
|
||||
deviceinfo_dtb="qcom/msm8917-* qcom/msm8937-* qcom/msm8940-*"
|
||||
deviceinfo_generate_extlinux_config="true"
|
||||
deviceinfo_boot_filesystem="ext2"
|
||||
@@ -0,0 +1,17 @@
|
||||
edt_ft5x06
|
||||
goodix_ts
|
||||
msm
|
||||
panel_xiaomi_land_hx8394f_boe
|
||||
panel_xiaomi_land_ili9881c_tianma
|
||||
panel_xiaomi_land_nt35521s_ebbg
|
||||
panel_xiaomi_riva_hx8394f_boe
|
||||
panel_xiaomi_riva_ili9881c_ebbg
|
||||
panel_xiaomi_riva_ili9881c_ebbgdjn
|
||||
panel_xiaomi_riva_ili9881c_tianma
|
||||
panel_xiaomi_santoni_hx8394f_boe
|
||||
panel_xiaomi_santoni_ili9881c_ebbg
|
||||
panel_xiaomi_santoni_ili9881c_ebbgdjn
|
||||
panel_xiaomi_ugglite_ili9881c_sc
|
||||
panel_xiaomi_ugglite_otm1901a_hx
|
||||
panel_xiaomi_ugglite_otm1901a_tm
|
||||
tps65132_regulator
|
||||
@@ -1,42 +0,0 @@
|
||||
# Maintainer: Barnabas Czeman <trabarni@gmail.com>
|
||||
# Reference: <https://postmarketos.org/devicepkg>
|
||||
pkgname=device-xiaomi-riva
|
||||
pkgdesc="Xiaomi Redmi 5A"
|
||||
pkgver=1
|
||||
pkgrel=0
|
||||
url="https://postmarketos.org"
|
||||
license="MIT"
|
||||
arch="aarch64"
|
||||
options="!check !archcheck"
|
||||
depends="postmarketos-base linux-xiaomi-riva mkbootimg mdss-fb-init-hack msm-fb-refresher"
|
||||
makedepends="devicepkg-dev"
|
||||
source="
|
||||
deviceinfo
|
||||
directfbrc
|
||||
fb.modes
|
||||
"
|
||||
subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
|
||||
|
||||
build() {
|
||||
devicepkg_build $startdir $pkgname
|
||||
}
|
||||
|
||||
package() {
|
||||
devicepkg_package $startdir $pkgname
|
||||
install -Dm644 "$srcdir"/fb.modes "$pkgdir"/etc/fb.modes
|
||||
install -Dm644 "$srcdir"/directfbrc "$pkgdir"/etc/directfbrc
|
||||
|
||||
}
|
||||
|
||||
nonfree_firmware() {
|
||||
pkgdesc="Wifi firmware"
|
||||
depends="firmware-xiaomi-riva wcnss-wlan"
|
||||
mkdir "$subpkgdir"
|
||||
}
|
||||
|
||||
|
||||
sha512sums="
|
||||
1db2d85434b41671c204383f90fe6d6dd1e3c7e874f1bb8d5ba6c7cfc61f91866f641bfa8a8d537ae20b7c8cfdbe4975fe98f40f512c50dc7c0b6c767c2dec43 deviceinfo
|
||||
3db3ec596e159be926ea2b5b2496c18e9bc7be24a64a232a56c89a0c9ee710aa2efb2b6fa9fc08efa34759e8242e6c629d08a4ce688ec8aa125830717c191515 directfbrc
|
||||
2ed1dca5a0799f650dacde4babfb4d9139614bbfbfc46c16b5e0533093928ca0db02756e3afd0554a4a037e1f2860d172e7f03cf7ad7ddeec1406cfb7417e0f4 fb.modes
|
||||
"
|
||||
@@ -1,30 +0,0 @@
|
||||
# Reference: <https://postmarketos.org/deviceinfo>
|
||||
# Please use double quotes only. You can source this file in shell scripts.
|
||||
|
||||
deviceinfo_format_version="0"
|
||||
deviceinfo_name="Xiaomi Redmi 5A"
|
||||
deviceinfo_manufacturer="Xiaomi"
|
||||
deviceinfo_codename="xiaomi-riva"
|
||||
deviceinfo_year="2017"
|
||||
deviceinfo_arch="aarch64"
|
||||
|
||||
# Device related
|
||||
deviceinfo_chassis="handset"
|
||||
deviceinfo_keyboard="false"
|
||||
deviceinfo_external_storage="true"
|
||||
deviceinfo_screen_width="720"
|
||||
deviceinfo_screen_height="1280"
|
||||
deviceinfo_swap_size_recommended="1024"
|
||||
|
||||
# Bootloader related
|
||||
deviceinfo_flash_method="fastboot"
|
||||
deviceinfo_kernel_cmdline="androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.usbconfigfs=false androidboot.bootdevice=7824900.sdhci earlycon=msm_hsl_uart,0x78B0000 androidboot.selinux=permissive loop.max_part=7 buildvariant=userdebug"
|
||||
deviceinfo_generate_bootimg="true"
|
||||
deviceinfo_bootimg_qcdt="false"
|
||||
deviceinfo_bootimg_dtb_second="false"
|
||||
deviceinfo_flash_offset_base="0x80000000"
|
||||
deviceinfo_flash_offset_kernel="0x00008000"
|
||||
deviceinfo_flash_offset_ramdisk="0x01000000"
|
||||
deviceinfo_flash_offset_second="0x00f00000"
|
||||
deviceinfo_flash_offset_tags="0x00000100"
|
||||
deviceinfo_flash_pagesize="2048"
|
||||
@@ -1 +0,0 @@
|
||||
pixelformat=ARGB
|
||||
@@ -1,7 +0,0 @@
|
||||
mode "720x1280-60"
|
||||
# D: 80.418 MHz, H: 78.841 kHz, V: 60.001 Hz
|
||||
geometry 720 1280 720 1280 16
|
||||
timings 12435 180 112 21 9 8 4
|
||||
accel false
|
||||
rgba 8/16,8/8,8/0,8/24
|
||||
endmode
|
||||
@@ -1,61 +0,0 @@
|
||||
# Reference: <https://postmarketos.org/devicepkg>
|
||||
# Maintainer: Asriel Dreemurr <asriel.danctnix@gmail.com>
|
||||
# Co-Maintainer: Danct12 <danct12@disroot.org>
|
||||
pkgname=device-xiaomi-santoni
|
||||
pkgdesc="Xiaomi Redmi 4X"
|
||||
pkgver=1
|
||||
pkgrel=0
|
||||
url="https://postmarketos.org"
|
||||
license="MIT"
|
||||
arch="aarch64"
|
||||
options="!check !archcheck"
|
||||
depends="
|
||||
postmarketos-base
|
||||
postmarketos-base-downstream-disable-udev-v4l
|
||||
linux-xiaomi-santoni
|
||||
mkbootimg
|
||||
msm-fb-refresher
|
||||
"
|
||||
makedepends="devicepkg-dev"
|
||||
subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
|
||||
source="
|
||||
ucm/90-device-xiaomi-santoni-audio.rules
|
||||
ucm/HiFi
|
||||
ucm/msm8920-sku7-snd-card.conf
|
||||
deviceinfo
|
||||
directfbrc
|
||||
fb.modes"
|
||||
|
||||
build() {
|
||||
devicepkg_build $startdir $pkgname
|
||||
}
|
||||
|
||||
package() {
|
||||
devicepkg_package $startdir $pkgname
|
||||
|
||||
install -Dm644 "$srcdir"/fb.modes "$pkgdir"/etc/fb.modes
|
||||
install -Dm644 "$srcdir"/directfbrc "$pkgdir"/etc/directfbrc
|
||||
}
|
||||
|
||||
nonfree_firmware() {
|
||||
pkgdesc="Wi-Fi, ADSP Firmware"
|
||||
depends="firmware-xiaomi-santoni wcnss-wlan adsp-audio pulseaudio pulseaudio-alsa alsa-plugins-pulse alsa-utils"
|
||||
install="$pkgname-nonfree-firmware.post-install"
|
||||
mkdir "$subpkgdir"
|
||||
|
||||
# Install UCM files for santoni
|
||||
install -Dm644 -t "$subpkgdir"/usr/share/alsa/ucm2/conf.d/msm8920-sku7-snd-card \
|
||||
"$srcdir"/HiFi \
|
||||
"$srcdir"/msm8920-sku7-snd-card.conf
|
||||
install -Dm644 "$srcdir"/90-device-xiaomi-santoni-audio.rules \
|
||||
"$subpkgdir"/etc/udev/rules.d/90-device-xiaomi-santoni-audio.rules
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
dc4bf7871307e659f220aebc3c9f7d74b861f46e1f3df1be37d724af984e46d91e553dbd36c2bd4482aa17dbe4d76d28dabe214952638f00830907466b110146 90-device-xiaomi-santoni-audio.rules
|
||||
3452fe367e7b199d610fb3d8e9113b35e04071afc7585080edb6fe584ecc29591d8f3ab53ed4583c1ccea5882aa51050d6e56a5db7ef88f6c9af648ba1ef88af HiFi
|
||||
7c702cf159699cea761ce7cb1ca21b79c59ceb3cdf1e410b537c4aa3a5aaa3be171b4c5555a713ac7a0e0f6dc389680cd5368a7783d14025fdc14d5f27fb922b msm8920-sku7-snd-card.conf
|
||||
c115cb9ff7664369e0b857502534f7f249f97f00cab5b124b5080d3878e5a338529f14e85f19eb5fb6c35de43b6d0fdfba172729ed45f05c04b8abe53d1c4a33 deviceinfo
|
||||
3db3ec596e159be926ea2b5b2496c18e9bc7be24a64a232a56c89a0c9ee710aa2efb2b6fa9fc08efa34759e8242e6c629d08a4ce688ec8aa125830717c191515 directfbrc
|
||||
b634d13cac1f10535a31c142c7391986ab402ae9910d8093989920f4c2dbd63722ee8595f11962bffd9d314e2835a1ead955a91355856f044911ddcf1e428427 fb.modes
|
||||
"
|
||||
-6
@@ -1,6 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# We make sure that tsched has not mentioned anywhere in the default PulseAudio config
|
||||
if [ "$(grep -c tsched /etc/pulse/default.pa)" -lt "1" ]; then
|
||||
sed -i 's/load-module module-udev-detect/load-module module-udev-detect tsched=0/g' /etc/pulse/default.pa
|
||||
fi
|
||||
@@ -1,35 +0,0 @@
|
||||
# Reference: <https://postmarketos.org/deviceinfo>
|
||||
# Please use double quotes only. You can source this file in shell scripts.
|
||||
|
||||
deviceinfo_format_version="0"
|
||||
deviceinfo_name="Xiaomi Redmi 4X"
|
||||
deviceinfo_manufacturer="Xiaomi"
|
||||
deviceinfo_codename="xiaomi-santoni"
|
||||
deviceinfo_year="2017"
|
||||
deviceinfo_arch="aarch64"
|
||||
|
||||
# Device related
|
||||
deviceinfo_chassis="handset"
|
||||
deviceinfo_keyboard="false"
|
||||
deviceinfo_external_storage="true"
|
||||
deviceinfo_screen_width="720"
|
||||
deviceinfo_screen_height="1280"
|
||||
deviceinfo_dev_touchscreen="/dev/input/event1"
|
||||
deviceinfo_swap_size_recommended="1024"
|
||||
|
||||
# Xiaomi Communications Co., Ltd.
|
||||
deviceinfo_usb_idVendor="0x2717"
|
||||
# Mi/Redmi series (RNDIS)
|
||||
deviceinfo_usb_idProduct="0xFF80"
|
||||
|
||||
# Bootloader related
|
||||
deviceinfo_flash_method="fastboot"
|
||||
deviceinfo_kernel_cmdline="androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_hsl_uart,0x78B0000 androidboot.selinux=permissive buildvariant=userdebug"
|
||||
deviceinfo_generate_bootimg="true"
|
||||
deviceinfo_bootimg_qcdt="false"
|
||||
deviceinfo_flash_offset_base="0x80000000"
|
||||
deviceinfo_flash_offset_kernel="0x00008000"
|
||||
deviceinfo_flash_offset_ramdisk="0x01000000"
|
||||
deviceinfo_flash_offset_second="0x00f00000"
|
||||
deviceinfo_flash_offset_tags="0x00000100"
|
||||
deviceinfo_flash_pagesize="4096"
|
||||
@@ -1 +0,0 @@
|
||||
pixelformat=ARGB
|
||||
@@ -1,8 +0,0 @@
|
||||
mode "720x1280-60"
|
||||
# D: 80.457 MHz, H: 78.725 kHz, V: 60.004 Hz
|
||||
geometry 720 1280 720 1280 16
|
||||
timings 12429 180 114 21 7 8 4
|
||||
accel false
|
||||
rgba 8/0,8/8,8/16,8/24
|
||||
endmode
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
# This udev rule is a workaround, udev doesn't care about the headphone jack input events :(
|
||||
# We need a better workaround, perhaps a daemon for jack detection?
|
||||
|
||||
# Init
|
||||
ATTRS{id}=="msm8920sku7sndc", RUN+="/usr/bin/alsaucm -c msm8920-sku7-snd-card set _verb HiFi set _enadev Speaker"
|
||||
|
||||
# Jack detection
|
||||
SUBSYSTEM=="switch",ATTRS{state}=="[1-4]",RUN+="/usr/bin/alsaucm -c msm8920-sku7-snd-card set _verb HiFi set _enadev Headphones"
|
||||
SUBSYSTEM=="switch",ATTRS{state}=="0",RUN+="/usr/bin/alsaucm -c msm8920-sku7-snd-card set _verb HiFi set _enadev Speaker"
|
||||
@@ -1,187 +0,0 @@
|
||||
SectionVerb {
|
||||
EnableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia1' 1"
|
||||
cset "name='MultiMedia1 Mixer TERT_MI2S_TX' 1"
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia1' 0"
|
||||
cset "name='MultiMedia1 Mixer TERT_MI2S_TX' 0"
|
||||
]
|
||||
|
||||
Value {
|
||||
TQ "HiFi"
|
||||
PlaybackPCM "hw:msm8920sku7sndc,0"
|
||||
CapturePCM "hw:msm8920sku7sndc,0"
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
SectionDevice."Speaker" {
|
||||
Comment "Internal speaker"
|
||||
|
||||
EnableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='MI2S_RX Channels' One"
|
||||
cset "name='RX2 MIX1 INP1' RX2"
|
||||
cset "name='RDAC2 MUX' RX2"
|
||||
cset "name='HPHR' Switch"
|
||||
cset "name='Lineout_1 amp' ENABLE"
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia1' 1"
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='MI2S_RX Channels' One"
|
||||
cset "name='RX2 MIX1 INP1' ZERO"
|
||||
cset "name='RDAC2 MUX' ZERO"
|
||||
cset "name='HPHR' ZERO"
|
||||
cset "name='Lineout_1 amp' DISABLE"
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia1' 0"
|
||||
]
|
||||
|
||||
Value {
|
||||
PlaybackChannels "2"
|
||||
PlaybackPriority 300
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
SectionDevice."Headphones" {
|
||||
Comment "Headset"
|
||||
|
||||
EnableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='MI2S_RX Channels' Two"
|
||||
cset "name='RX1 MIX1 INP1' RX1"
|
||||
cset "name='RX2 MIX1 INP1' RX2"
|
||||
cset "name='RDAC2 MUX' RX2"
|
||||
cset "name='HPHL' Switch"
|
||||
cset "name='HPHR' Switch"
|
||||
cset "name='headset amp' ENABLE"
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia1' 1"
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='MI2S_RX Channels' One"
|
||||
cset "name='RX1 MIX1 INP1' ZERO"
|
||||
cset "name='RX2 MIX1 INP1' ZERO"
|
||||
cset "name='RDAC2 MUX' ZERO"
|
||||
cset "name='HPHL' ZERO"
|
||||
cset "name='HPHR' ZERO"
|
||||
cset "name='headset amp' DISABLE"
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia1' 0"
|
||||
]
|
||||
|
||||
Value {
|
||||
PlaybackChannels "2"
|
||||
PlaybackPriority 100
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
SectionDevice."Handset" {
|
||||
Comment "Earpiece speaker"
|
||||
|
||||
EnableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='RX1 MIX1 INP1' RX1"
|
||||
cset "name='RDAC2 MUX' RX1"
|
||||
cset "name='RX1 Digital Volume' 86"
|
||||
cset "name='EAR PA Gain' POS_6_DB"
|
||||
cset "name='EAR_S' Switch"
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia1' 1"
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='RX1 MIX1 INP1' ZERO"
|
||||
cset "name='RDAC2 MUX' ZERO"
|
||||
cset "name='RX1 Digital Volume' 86"
|
||||
cset "name='EAR PA Gain' POS_6_DB"
|
||||
cset "name='EAR_S' ZERO"
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia1' 0"
|
||||
]
|
||||
|
||||
Value {
|
||||
PlaybackChannels "2"
|
||||
PlaybackPriority 200
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
SectionDevice."HandsetMic" {
|
||||
Comment "Internal Microphone"
|
||||
|
||||
ConflictingDevice [
|
||||
"HeadsetMic"
|
||||
]
|
||||
|
||||
EnableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='ADC1 Volume' 6"
|
||||
cset "name='DEC1 MUX' ADC1"
|
||||
cset "name='IIR1 INP1 MUX' DEC1"
|
||||
cset "name='MultiMedia1 Mixer TERT_MI2S_TX' 1"
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='ADC1 Volume' 4"
|
||||
cset "name='DEC1 MUX' ZERO"
|
||||
cset "name='MultiMedia1 Mixer TERT_MI2S_TX' 0"
|
||||
]
|
||||
|
||||
Value {
|
||||
CapturePriority 500
|
||||
CaptureChannels "2"
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
SectionDevice."HeadsetMic" {
|
||||
Comment "Headset Microphone"
|
||||
|
||||
ConflictingDevice [
|
||||
"HandsetMic"
|
||||
]
|
||||
|
||||
EnableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='ADC2 Volume' 6"
|
||||
cset "name='DEC1 MUX' ADC2"
|
||||
cset "name='ADC2 MUX' INP2"
|
||||
cset "name='IIR1 INP1 MUX' DEC1"
|
||||
cset "name='MultiMedia1 Mixer TERT_MI2S_TX' 1"
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='ADC2 Volume' 4"
|
||||
cset "name='DEC1 MUX' ZERO"
|
||||
cset "name='ADC2 MUX' ZERO"
|
||||
cset "name='MultiMedia1 Mixer TERT_MI2S_TX' 0"
|
||||
]
|
||||
|
||||
Value {
|
||||
CapturePriority 100
|
||||
CaptureChannels "2"
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,171 +0,0 @@
|
||||
Syntax 2
|
||||
|
||||
SectionUseCase."HiFi" {
|
||||
File "HiFi"
|
||||
}
|
||||
|
||||
SectionDefaults [
|
||||
cdev "hw:msm8920sku7sndc"
|
||||
|
||||
cset "name='TTY Mode' Off"
|
||||
cset "name='RX1 Digital Volume' 86"
|
||||
cset "name='RX2 Digital Volume' 84"
|
||||
cset "name='RX3 Digital Volume' 84"
|
||||
cset "name='IIR1 INP1 Volume' 84"
|
||||
cset "name='IIR1 INP2 Volume' 84"
|
||||
cset "name='IIR1 INP3 Volume' 84"
|
||||
cset "name='IIR1 INP4 Volume' 84"
|
||||
cset "name='ADC1 Volume' 4"
|
||||
cset "name='ADC2 Volume' 4"
|
||||
cset "name='ADC3 Volume' 4"
|
||||
cset "name='DEC1 Volume' 84"
|
||||
cset "name='DEC2 Volume' 84"
|
||||
cset "name='DEC2 MUX' ZERO"
|
||||
cset "name='DEC1 MUX' ZERO"
|
||||
cset "name='ADC2 MUX' ZERO"
|
||||
cset "name='RDAC2 MUX' ZERO"
|
||||
cset "name='RX2 MIX2 INP1' ZERO"
|
||||
cset "name='RX1 MIX2 INP1' ZERO"
|
||||
cset "name='RX3 MIX1 INP2' ZERO"
|
||||
cset "name='RX3 MIX1 INP1' ZERO"
|
||||
cset "name='RX2 MIX1 INP2' ZERO"
|
||||
cset "name='RX2 MIX1 INP1' ZERO"
|
||||
cset "name='RX1 MIX1 INP2' ZERO"
|
||||
cset "name='RX1 MIX1 INP1' ZERO"
|
||||
cset "name='EAR_S' ZERO"
|
||||
cset "name='HPHL' ZERO"
|
||||
cset "name='HPHR' ZERO"
|
||||
cset "name='Lineout_1 amp' DISABLE"
|
||||
cset "name='headset amp' DISABLE"
|
||||
cset "name='SPK' ZERO"
|
||||
cset "name='WSA Spk Switch' ZERO"
|
||||
cset "name='EAR PA Gain' POS_6_DB"
|
||||
cset "name='EAR PA Boost' ENABLE"
|
||||
cset "name='EAR PA Gain' POS_1P5_DB"
|
||||
cset "name='EAR PA Boost' ENABLE"
|
||||
cset "name='MI2S_RX Channels' One"
|
||||
cset "name='MI2S_TX Channels' One"
|
||||
cset "name='PRI_MI2S_RX_DL_HL Switch' 0"
|
||||
cset "name='PRI_MI2S_RX_VI_FB_MUX' ZERO"
|
||||
cset "name='DEC3 MUX' ZERO"
|
||||
cset "name='DEC4 MUX' ZERO"
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia1' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1' 0"
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia3' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX Audio Mixer MultiMedia3' 0"
|
||||
cset "name='AFE_PCM_RX Audio Mixer MultiMedia3' 0"
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia4' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4' 0"
|
||||
cset "name='AFE_PCM_RX Audio Mixer MultiMedia4' 0"
|
||||
cset "name='INTERNAL_FM_RX Audio Mixer MultiMedia4' 0"
|
||||
cset "name='PRI_MI2S_RX Audio Mixer MultiMedia5' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX Audio Mixer MultiMedia5' 0"
|
||||
cset "name='MultiMedia1 Mixer TERT_MI2S_TX' 0"
|
||||
cset "name='MultiMedia5 Mixer TERT_MI2S_TX' 0"
|
||||
cset "name='MultiMedia1 Mixer INTERNAL_BT_SCO_TX' 0"
|
||||
cset "name='PRI_MI2S_RX_Voice Mixer CSVoice' 0"
|
||||
cset "name='Voice_Tx Mixer TERT_MI2S_TX_Voice' 0"
|
||||
cset "name='Internal BTSCO SampleRate' BTSCO_RATE_8KHZ"
|
||||
cset "name='INTERNAL_BT_SCO_RX_Voice Mixer CSVoice' 0"
|
||||
cset "name='Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice' 0"
|
||||
cset "name='MultiMedia6 Mixer TERT_MI2S_TX' 0"
|
||||
cset "name='PRI_MI2S_RX_Voice Mixer Voice2' 0"
|
||||
cset "name='Voice2_Tx Mixer TERT_MI2S_TX_Voice2' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX_Voice Mixer Voice2' 0"
|
||||
cset "name='Voice2_Tx Mixer INTERNAL_BT_SCO_TX_Voice2' 0"
|
||||
cset "name='AFE_PCM_RX_Voice Mixer Voice2' 0"
|
||||
cset "name='Voice2_Tx Mixer AFE_PCM_TX_Voice2' 0"
|
||||
cset "name='PRI_MI2S_RX_Voice Mixer VoLTE' 0"
|
||||
cset "name='VoLTE_Tx Mixer TERT_MI2S_TX_VoLTE' 0"
|
||||
cset "name='HDMI_RX_Voice Mixer VoLTE' 0"
|
||||
cset "name='VoLTE_Tx Mixer SLIM_0_TX_VoLTE' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX_Voice Mixer VoLTE' 0"
|
||||
cset "name='VoLTE_Tx Mixer INTERNAL_BT_SCO_TX_VoLTE' 0"
|
||||
cset "name='AFE_PCM_RX_Voice Mixer VoLTE' 0"
|
||||
cset "name='VoLTE_Tx Mixer AFE_PCM_TX_VoLTE' 0"
|
||||
cset "name='PRI_MI2S_RX_Voice Mixer VoWLAN' 0"
|
||||
cset "name='VoWLAN_Tx Mixer TERT_MI2S_TX_VoWLAN' 0"
|
||||
cset "name='HDMI_RX_Voice Mixer VoWLAN' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX_Voice Mixer VoWLAN' 0"
|
||||
cset "name='VoWLAN_Tx Mixer INTERNAL_BT_SCO_TX_VoWLAN' 0"
|
||||
cset "name='AFE_PCM_RX_Voice Mixer VoWLAN' 0"
|
||||
cset "name='VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN' 0"
|
||||
cset "name='PRI_MI2S_RX_Voice Mixer VoiceMMode1' 0"
|
||||
cset "name='VoiceMMode1_Tx Mixer TERT_MI2S_TX_MMode1' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX_Voice Mixer VoiceMMode1' 0"
|
||||
cset "name='VoiceMMode1_Tx Mixer INT_BT_SCO_TX_MMode1' 0"
|
||||
cset "name='AFE_PCM_RX_Voice Mixer VoiceMMode1' 0"
|
||||
cset "name='VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1' 0"
|
||||
cset "name='PRI_MI2S_RX_Voice Mixer VoiceMMode2' 0"
|
||||
cset "name='VoiceMMode2_Tx Mixer TERT_MI2S_TX_MMode2' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX_Voice Mixer VoiceMMode2' 0"
|
||||
cset "name='VoiceMMode2_Tx Mixer INT_BT_SCO_TX_MMode2' 0"
|
||||
cset "name='AFE_PCM_RX_Voice Mixer VoiceMMode2' 0"
|
||||
cset "name='VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2' 0"
|
||||
cset "name='PRI_MI2S_RX_Voice Mixer Voip' 0"
|
||||
cset "name='Voip_Tx Mixer TERT_MI2S_TX_Voip' 0"
|
||||
cset "name='Internal BTSCO SampleRate' BTSCO_RATE_8KHZ"
|
||||
cset "name='INTERNAL_BT_SCO_RX_Voice Mixer Voip' 0"
|
||||
cset "name='Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip' 0"
|
||||
cset "name='PRI_MI2S_RX_Voice Mixer VoiceMMode1' 0"
|
||||
cset "name='VoiceMMode1_Tx Mixer TERT_MI2S_TX_MMode1' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX_Voice Mixer VoiceMMode1' 0"
|
||||
cset "name='VoiceMMode1_Tx Mixer INT_BT_SCO_TX_MMode1' 0"
|
||||
cset "name='AFE_PCM_RX_Voice Mixer VoiceMMode1' 0"
|
||||
cset "name='VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1' 0"
|
||||
cset "name='PRI_MI2S_RX_Voice Mixer VoiceMMode2' 0"
|
||||
cset "name='VoiceMMode2_Tx Mixer TERT_MI2S_TX_MMode2' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX_Voice Mixer VoiceMMode2' 0"
|
||||
cset "name='VoiceMMode2_Tx Mixer INT_BT_SCO_TX_MMode2' 0"
|
||||
cset "name='AFE_PCM_RX_Voice Mixer VoiceMMode2' 0"
|
||||
cset "name='VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2' 0"
|
||||
cset "name='Internal FM RX Volume' 0"
|
||||
cset "name='PRI_MI2S_RX Port Mixer INTERNAL_FM_TX' 0"
|
||||
cset "name='MultiMedia1 Mixer INTERNAL_FM_TX' 0"
|
||||
cset "name='MultiMedia2 Mixer INTERNAL_FM_TX' 0"
|
||||
cset "name='MultiMedia5 Mixer INTERNAL_FM_TX' 0"
|
||||
cset "name='INTERNAL_FM_RX Audio Mixer MultiMedia1' 0"
|
||||
cset "name='INTERNAL_FM_RX Audio Mixer MultiMedia5' 0"
|
||||
cset "name='RT_PROXY_1_RX SetCalMode' CAL_MODE_NONE"
|
||||
cset "name='RT_PROXY_1_TX SetCalMode' CAL_MODE_NONE"
|
||||
cset "name='MultiMedia1 Mixer VOC_REC_UL' 0"
|
||||
cset "name='MultiMedia1 Mixer VOC_REC_DL' 0"
|
||||
cset "name='Incall_Music Audio Mixer MultiMedia2' 0"
|
||||
cset "name='Incall_Music_2 Audio Mixer MultiMedia9' 0"
|
||||
cset "name='PRI_MI2S_RX_Voice Mixer QCHAT' 0"
|
||||
cset "name='QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT' 0"
|
||||
cset "name='INTERNAL_BT_SCO_RX_Voice Mixer QCHAT' 0"
|
||||
cset "name='QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT' 0"
|
||||
cset "name='AUDIO_REF_EC_UL1 MUX' None"
|
||||
cset "name='IIR1 Band1' 268435456"
|
||||
cset "name='IIR1 Band1' 0"
|
||||
cset "name='IIR1 Band1' ,0"
|
||||
cset "name='IIR1 Band1' ,,0"
|
||||
cset "name='IIR1 Band1' ,,,0"
|
||||
cset "name='IIR1 Band2' 268435456"
|
||||
cset "name='IIR1 Band2' 0"
|
||||
cset "name='IIR1 Band2' ,0"
|
||||
cset "name='IIR1 Band2' ,,0"
|
||||
cset "name='IIR1 Band2' ,,,0"
|
||||
cset "name='IIR1 Band3' 268435456"
|
||||
cset "name='IIR1 Band3' 0"
|
||||
cset "name='IIR1 Band3' ,0"
|
||||
cset "name='IIR1 Band3' ,,0"
|
||||
cset "name='IIR1 Band3' ,,,0"
|
||||
cset "name='IIR1 Band4' 268435456"
|
||||
cset "name='IIR1 Band4' 0"
|
||||
cset "name='IIR1 Band4' ,0"
|
||||
cset "name='IIR1 Band4' ,,0"
|
||||
cset "name='IIR1 Band4' ,,,0"
|
||||
cset "name='IIR1 Band5' 268435456"
|
||||
cset "name='IIR1 Band5' 0"
|
||||
cset "name='IIR1 Band5' ,0"
|
||||
cset "name='IIR1 Band5' ,,0"
|
||||
cset "name='IIR1 Band5' ,,,0"
|
||||
cset "name='IIR1 Enable Band1' 0"
|
||||
cset "name='IIR1 Enable Band2' 0"
|
||||
cset "name='IIR1 Enable Band3' 0"
|
||||
cset "name='IIR1 Enable Band4' 0"
|
||||
cset "name='IIR1 Enable Band5' 0"
|
||||
]
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
# Maintainer: Barnabas Czeman <trabarni@gmail.com>
|
||||
pkgname=firmware-xiaomi-riva
|
||||
pkgver=0.1
|
||||
pkgrel=0
|
||||
_commit="55441372abe4072f0f174a9614dcbe4b0d4bfcab"
|
||||
pkgdesc="Firmware files for Xiaomi Redmi 5A"
|
||||
url="https://postmarketos.org"
|
||||
arch="aarch64"
|
||||
license="proprietary"
|
||||
options="!strip !check !archcheck !spdx pmb:cross-native !tracedeps"
|
||||
|
||||
_files="wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b06
|
||||
wcnss.b09 wcnss.b10 wcnss.b11 wcnss.b12 wcnss.mdt"
|
||||
_files_prima="WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin WCNSS_wlan_dictionary.dat"
|
||||
source="$pkgname-$_commit.tar.gz::https://gitlab.com/ALTracer/vendor_xiaomi_rolex/-/archive/$_commit/vendor_xiaomi_rolex-$_commit.tar.gz"
|
||||
builddir="$srcdir/vendor_xiaomi_rolex-$_commit"
|
||||
|
||||
package() {
|
||||
# /lib/firmware/postmarketos
|
||||
for _i in $_files; do
|
||||
install -D -m644 "$_i" \
|
||||
"$pkgdir"/lib/firmware/postmarketos/"$_i"
|
||||
done
|
||||
|
||||
# /lib/firmware/postmarketos/wlan/prima
|
||||
for _i in $_files_prima; do
|
||||
install -D -m644 wlan/prima/"$_i" \
|
||||
"$pkgdir"/lib/firmware/postmarketos/wlan/prima/"$_i"
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
sha512sums="
|
||||
91493ed18d462b1aa72df72f06d975a68ef2133b2f6f33971452a77477e5045b8dc9d3842779449407681e49362cdc1a700dcaf3b246f5e5b48450a6edc3cbde firmware-xiaomi-riva-55441372abe4072f0f174a9614dcbe4b0d4bfcab.tar.gz
|
||||
"
|
||||
@@ -1,35 +0,0 @@
|
||||
pkgname=firmware-xiaomi-santoni
|
||||
pkgver=1
|
||||
pkgrel=4
|
||||
_commit="926d2ffbcb572ede8ad5942acea69175908afbb7"
|
||||
pkgdesc="Firmware files for Xiaomi Redmi 4X"
|
||||
url="https://postmarketos.org"
|
||||
arch="aarch64"
|
||||
license="proprietary"
|
||||
options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
|
||||
|
||||
# Source
|
||||
_files="wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b06
|
||||
wcnss.b09 wcnss.b10 wcnss.b11 wcnss.b12 wcnss.mdt
|
||||
adsp.b00 adsp.b01 adsp.b02 adsp.b03 adsp.b04 adsp.b05
|
||||
adsp.b06 adsp.b07 adsp.b08 adsp.b09 adsp.b10 adsp.b11
|
||||
adsp.b12 adsp.b13 adsp.b14 adsp.mdt"
|
||||
_files_prima="WCNSS_wlan_dictionary.dat WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin"
|
||||
source="$pkgname-$_commit.tar.gz::https://github.com/Danct12/vendor_xiaomi_santoni/archive/$_commit.tar.gz"
|
||||
builddir="$srcdir/vendor_xiaomi_santoni-$_commit"
|
||||
|
||||
package() {
|
||||
# /lib/firmware/postmarketos
|
||||
for _i in $_files; do
|
||||
install -D -m644 "$_i" \
|
||||
"$pkgdir"/lib/firmware/postmarketos/"$_i"
|
||||
done
|
||||
|
||||
# /lib/firmware/postmarketos/wlan/prima
|
||||
for _i in $_files_prima; do
|
||||
install -D -m644 wlan/prima/"$_i" \
|
||||
"$pkgdir"/lib/firmware/postmarketos/wlan/prima/"$_i"
|
||||
done
|
||||
}
|
||||
|
||||
sha512sums="389f5915fd9004f0256a8d29702da125c04f483805d0caf432db2d228f19660c00c01458d5df5faf5b83fd2766fbae10c28db5d0a82323d3ee64e367dfcef396 firmware-xiaomi-santoni-926d2ffbcb572ede8ad5942acea69175908afbb7.tar.gz"
|
||||
@@ -1,40 +0,0 @@
|
||||
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c
|
||||
index 66c3661f7ed9..b72c82c0104a 100644
|
||||
--- a/drivers/video/fbdev/msm/mdss_fb.c
|
||||
+++ b/drivers/video/fbdev/msm/mdss_fb.c
|
||||
@@ -1311,7 +1311,7 @@ static int mdss_fb_probe(struct platform_device *pdev)
|
||||
mfd->bl_scale = 1024;
|
||||
mfd->bl_min_lvl = 30;
|
||||
mfd->ad_bl_level = 0;
|
||||
- mfd->fb_imgType = MDP_RGBA_8888;
|
||||
+ mfd->fb_imgType = MDP_BGRA_8888;
|
||||
mfd->calib_mode_bl = 0;
|
||||
mfd->unset_bl_level = U32_MAX;
|
||||
mfd->bl_extn_level = -1;
|
||||
@@ -2729,7 +2729,25 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
|
||||
var->transp.length = 8;
|
||||
bpp = 4;
|
||||
break;
|
||||
-
|
||||
+ case MDP_BGRA_8888:
|
||||
+ fix->type = FB_TYPE_PACKED_PIXELS;
|
||||
+ fix->xpanstep = 1;
|
||||
+ fix->ypanstep = 1;
|
||||
+ var->vmode = FB_VMODE_NONINTERLACED;
|
||||
+ var->blue.offset = 0;
|
||||
+ var->green.offset = 8;
|
||||
+ var->red.offset = 16;
|
||||
+ var->blue.length = 8;
|
||||
+ var->green.length = 8;
|
||||
+ var->red.length = 8;
|
||||
+ var->blue.msb_right = 0;
|
||||
+ var->green.msb_right = 0;
|
||||
+ var->red.msb_right = 0;
|
||||
+ var->transp.offset = 24;
|
||||
+ var->transp.length = 8;
|
||||
+ bpp = 4;
|
||||
+ break;
|
||||
+
|
||||
case MDP_YCRYCB_H2V1:
|
||||
fix->type = FB_TYPE_INTERLEAVED_PLANES;
|
||||
fix->xpanstep = 2;
|
||||
@@ -1,50 +0,0 @@
|
||||
# Maintainer: Barnabas Czeman <trabarni@gmail.com>
|
||||
# Reference: <https://postmarketos.org/vendorkernel>
|
||||
# Kernel config based on: arch/arm64/configs/riva_defconfig
|
||||
|
||||
pkgname=linux-xiaomi-riva
|
||||
pkgver=4.9.337
|
||||
pkgrel=0
|
||||
pkgdesc="Xiaomi Redmi 5A kernel fork"
|
||||
arch="aarch64"
|
||||
_carch="arm64"
|
||||
_flavor="xiaomi-riva"
|
||||
url="https://kernel.org"
|
||||
license="GPL-2.0-only"
|
||||
options="!strip !check !tracedeps pmb:cross-native"
|
||||
makedepends="bash bc bison devicepkg-dev flex openssl-dev perl"
|
||||
|
||||
# Source
|
||||
_repository="android_kernel_xiaomi_msm8937"
|
||||
_commit="1c2aef5588be23134801cfa304b1b30168367811"
|
||||
_config="config-$_flavor.$arch"
|
||||
source="
|
||||
$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
|
||||
$_config
|
||||
fix-xorg-mdss-update-fb-info.patch
|
||||
99_framebuffer.patch
|
||||
"
|
||||
builddir="$srcdir/$_repository-$_commit"
|
||||
_outdir="out"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
. downstreamkernel_prepare
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
|
||||
}
|
||||
|
||||
package() {
|
||||
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
723376e9ce54f1d7745e45658690ea503d716792638716275e0d47bb8bfdf83ce635555c28b1be80a660e1e391f0124ad264aa135ed9b4e08a2d63cb5f9beb78 linux-xiaomi-riva-1c2aef5588be23134801cfa304b1b30168367811.tar.gz
|
||||
e271cddb8401e8aa1f0d729d83064ad0c6ca3cd46e9105a7b281aedfb39eab867aa72c69c7322b716b897d27b6598ea19b7e2d2fedf1f3a8f7e00a29107e8148 config-xiaomi-riva.aarch64
|
||||
e11a1ca524a05a5fe8b845937dbc57ee38c52e0a1a979d8e7be0ac53df22f84dfb424205ee7f541acfca3daba3e9f5d49bb4b9e9bb482eb354de14eb28bd0094 fix-xorg-mdss-update-fb-info.patch
|
||||
741a46c6679172639568df96614b12a543563895ddee79051d88d28742b26d9c725f1d03dc208152c46e87b8b58240a3e206877da9a6a72035095e0f43458a72 99_framebuffer.patch
|
||||
"
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,107 +0,0 @@
|
||||
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c
|
||||
index 66c3661f7ed9..e4f98d88c7d9 100644
|
||||
--- a/drivers/video/fbdev/msm/mdss_fb.c
|
||||
+++ b/drivers/video/fbdev/msm/mdss_fb.c
|
||||
@@ -1881,7 +1881,7 @@ static void mdss_panel_validate_debugfs_info(struct msm_fb_data_type *mfd)
|
||||
if (is_panel_split(mfd) && pdata->next)
|
||||
mdss_fb_validate_split(pdata->panel_info.xres,
|
||||
pdata->next->panel_info.xres, mfd);
|
||||
- mdss_panelinfo_to_fb_var(panel_info, var);
|
||||
+ mdss_panelinfo_to_fb_var(mfd);
|
||||
if (mdss_fb_send_panel_event(mfd, MDSS_EVENT_CHECK_PARAMS,
|
||||
panel_info))
|
||||
pr_err("Failed to send panel event CHECK_PARAMS\n");
|
||||
@@ -2017,7 +2017,7 @@ static int mdss_fb_blank_unblank(struct msm_fb_data_type *mfd)
|
||||
* programmed in the controller.
|
||||
* Update this info in the upstream structs.
|
||||
*/
|
||||
- mdss_panelinfo_to_fb_var(panel_info, var);
|
||||
+ mdss_panelinfo_to_fb_var(mfd);
|
||||
|
||||
/* Start the work thread to signal idle time */
|
||||
if (mfd->idle_time)
|
||||
@@ -2757,7 +2757,7 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
|
||||
return ret;
|
||||
}
|
||||
|
||||
- mdss_panelinfo_to_fb_var(panel_info, var);
|
||||
+ mdss_panelinfo_to_fb_var(mfd);
|
||||
|
||||
fix->type = panel_info->is_3d_panel;
|
||||
if (mfd->mdp.fb_stride)
|
||||
@@ -3461,7 +3461,7 @@ static void mdss_fb_update_resolution(struct msm_fb_data_type *mfd,
|
||||
}
|
||||
var->xres_virtual = var->xres;
|
||||
var->yres_virtual = pinfo->yres * mfd->fb_page;
|
||||
- mdss_panelinfo_to_fb_var(pinfo, var);
|
||||
+ mdss_panelinfo_to_fb_var(mfd);
|
||||
}
|
||||
|
||||
int mdss_fb_atomic_commit(struct fb_info *info,
|
||||
@@ -3695,9 +3695,15 @@ static void mdss_fb_var_to_panelinfo(struct fb_var_screeninfo *var,
|
||||
pinfo->mipi.dsi_pclk_rate = pinfo->clk_rate;
|
||||
}
|
||||
|
||||
-void mdss_panelinfo_to_fb_var(struct mdss_panel_info *pinfo,
|
||||
- struct fb_var_screeninfo *var)
|
||||
+void mdss_panelinfo_to_fb_var(struct msm_fb_data_type *mfd)
|
||||
{
|
||||
+ if (!mfd)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ struct mdss_panel_info *pinfo = mfd->panel_info;
|
||||
+ struct fb_info *fbi = mfd->fbi;
|
||||
+ struct fb_var_screeninfo *var = &fbi->var;
|
||||
+
|
||||
u32 frame_rate;
|
||||
|
||||
var->xres = mdss_fb_get_panel_xres(pinfo);
|
||||
@@ -3732,10 +3738,17 @@ void mdss_panelinfo_to_fb_var(struct mdss_panel_info *pinfo,
|
||||
if (pinfo->physical_height)
|
||||
var->height = pinfo->physical_height;
|
||||
|
||||
- pr_debug("ScreenInfo: res=%dx%d [%d, %d] [%d, %d]\n",
|
||||
- var->xres, var->yres, var->left_margin,
|
||||
- var->right_margin, var->upper_margin,
|
||||
- var->lower_margin);
|
||||
+ //Hack to update current fbi->mode according to fbi->var when var is updated from panel info
|
||||
+ if (fbi->mode) {
|
||||
+ printk("Updating mdss fb mode from fb var\n");
|
||||
+ fb_var_to_videomode(fbi->mode, var);
|
||||
+ }
|
||||
+
|
||||
+ printk("ScreenInfo: res=%dx%d [%d, %d] [%d, %d]\n",
|
||||
+ var->xres, var->yres, var->left_margin,
|
||||
+ var->right_margin, var->upper_margin,
|
||||
+ var->lower_margin);
|
||||
+
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/drivers/video/fbdev/msm/mdss_fb.h b/drivers/video/fbdev/msm/mdss_fb.h
|
||||
index 4b39f9edef0c..4a0d13f2f079 100644
|
||||
--- a/drivers/video/fbdev/msm/mdss_fb.h
|
||||
+++ b/drivers/video/fbdev/msm/mdss_fb.h
|
||||
@@ -476,8 +476,7 @@ int mdss_fb_async_position_update(struct fb_info *info,
|
||||
|
||||
u32 mdss_fb_get_mode_switch(struct msm_fb_data_type *mfd);
|
||||
void mdss_fb_report_panel_dead(struct msm_fb_data_type *mfd);
|
||||
-void mdss_panelinfo_to_fb_var(struct mdss_panel_info *pinfo,
|
||||
- struct fb_var_screeninfo *var);
|
||||
+void mdss_panelinfo_to_fb_var(struct msm_fb_data_type *mfd);
|
||||
void mdss_fb_calc_fps(struct msm_fb_data_type *mfd);
|
||||
void mdss_fb_idle_pc(struct msm_fb_data_type *mfd);
|
||||
#endif /* MDSS_FB_H */
|
||||
diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
|
||||
index b70db4faac09..951c7c7497d5 100644
|
||||
--- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c
|
||||
+++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
|
||||
@@ -3846,7 +3846,7 @@ int mdss_mdp_dfps_update_params(struct msm_fb_data_type *mfd,
|
||||
* data, so any further call to get the screen
|
||||
* info has the updated timings.
|
||||
*/
|
||||
- mdss_panelinfo_to_fb_var(&pdata->panel_info, var);
|
||||
+ mdss_panelinfo_to_fb_var(mfd);
|
||||
|
||||
MDSS_XLOG(dfps);
|
||||
mutex_unlock(&mdp5_data->dfps_lock);
|
||||
@@ -1,40 +0,0 @@
|
||||
diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
|
||||
index 075ee8a3880..b4531f66a06 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_fb.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_fb.c
|
||||
@@ -868,7 +868,8 @@ static int mdss_fb_probe(struct platform_device *pdev)
|
||||
mfd->bl_scale = 1024;
|
||||
mfd->bl_min_lvl = 30;
|
||||
mfd->ad_bl_level = 0;
|
||||
- mfd->fb_imgType = MDP_RGBA_8888;
|
||||
+ // Default framebuffer format.
|
||||
+ mfd->fb_imgType = MDP_BGRA_8888;
|
||||
mfd->calib_mode_bl = 0;
|
||||
|
||||
if (mfd->panel.type == MIPI_VIDEO_PANEL ||
|
||||
@@ -2143,6 +2144,25 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
|
||||
bpp = 4;
|
||||
break;
|
||||
|
||||
+ case MDP_BGRA_8888:
|
||||
+ fix->type = FB_TYPE_PACKED_PIXELS;
|
||||
+ fix->xpanstep = 1;
|
||||
+ fix->ypanstep = 1;
|
||||
+ var->vmode = FB_VMODE_NONINTERLACED;
|
||||
+ var->blue.offset = 0;
|
||||
+ var->green.offset = 8;
|
||||
+ var->red.offset = 16;
|
||||
+ var->blue.length = 8;
|
||||
+ var->green.length = 8;
|
||||
+ var->red.length = 8;
|
||||
+ var->blue.msb_right = 0;
|
||||
+ var->green.msb_right = 0;
|
||||
+ var->red.msb_right = 0;
|
||||
+ var->transp.offset = 24;
|
||||
+ var->transp.length = 8;
|
||||
+ bpp = 4;
|
||||
+ break;
|
||||
+
|
||||
case MDP_YCRYCB_H2V1:
|
||||
fix->type = FB_TYPE_INTERLEAVED_PLANES;
|
||||
fix->xpanstep = 2;
|
||||
@@ -1,50 +0,0 @@
|
||||
# Kernel config based on: arch/arm64/configs/santoni_defconfig
|
||||
pkgname=linux-xiaomi-santoni
|
||||
pkgver=3.18.140
|
||||
pkgrel=3
|
||||
pkgdesc="Xiaomi Redmi 4X kernel fork - msm-3.18 rebase"
|
||||
arch="aarch64"
|
||||
_carch="arm64"
|
||||
_flavor="xiaomi-santoni"
|
||||
url="https://kernel.org"
|
||||
license="GPL2"
|
||||
options="!strip !check !tracedeps pmb:cross-native"
|
||||
makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
|
||||
|
||||
# Source
|
||||
_repository="msm-3.18"
|
||||
_commit="2dd8017f40290eb326e352cca254cd8bdd1614c9"
|
||||
_config="config-$_flavor.$arch"
|
||||
source="
|
||||
$pkgname-$_commit.tar.gz::https://github.com/bitrvmpd/$_repository/archive/$_commit.tar.gz
|
||||
fix-xorg-mdss-update-fb-info.patch
|
||||
disable-substream-runtime-errors.patch
|
||||
bt-hci-smd.patch
|
||||
99_framebuffer.patch
|
||||
gcc10-extern_YYLOC_global_declaration.patch
|
||||
$_config
|
||||
"
|
||||
builddir="$srcdir/$_repository-$_commit"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
. downstreamkernel_prepare
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
make ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
|
||||
}
|
||||
|
||||
package() {
|
||||
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
|
||||
}
|
||||
|
||||
sha512sums="d7a290e676aa40d35289cedbad5dd077accff4e1a2467223765a79f101ff4c1313315cbffd574ad74c648c4b8f5751d16a1fa1607c9939b373d3f2974a7b2326 linux-xiaomi-santoni-2dd8017f40290eb326e352cca254cd8bdd1614c9.tar.gz
|
||||
a277af28a718f5caf94257005393aa92d62c96110a8ec6368ff62f2e0d871b69c56c4ce00174db637204d53fa63ad3a79b8d6141713dca0878e1f06fe0379caa fix-xorg-mdss-update-fb-info.patch
|
||||
14ee08e4f93befeaabfb35e6bf0b8bb5b2eecba1c21ce4498499c377c2cf4d5fccbfe85e14ca92c704d067386ec08a06805ab886f0ec7691471cf379838545aa disable-substream-runtime-errors.patch
|
||||
f5850f712ce7aa42ada1971fc5f428ac8b9f5eef77d8bfb09bb24e0636e0b70ae78009466ed4962bd257721126577a756114e2ee2a70d4a925dd57e0ec7bcfa6 bt-hci-smd.patch
|
||||
a6f9899ab97af727e4450201a2edc2bf6fc805d981fa967581b98c5e1ee0b9c005feeeb647b40b220a79ed9a318cf9bbf8f953aab941daf6fea4790a372aae21 99_framebuffer.patch
|
||||
2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch
|
||||
753b1517980a6aa4bc1ccea6d013cb5cf74cd85a92a279a5fff2f13f0930a9266305d9efdd06ce4fe7baf76eb47118fe95b855a458e0457d91041da9b8ef0897 config-xiaomi-santoni.aarch64"
|
||||
@@ -1,758 +0,0 @@
|
||||
From 08188f95f81aa4c716184eb40e08873e810ad089 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Pigg <adam@piggz.co.uk>
|
||||
Date: Sat, 1 Jul 2017 09:04:43 +0100
|
||||
Subject: [PATCH] BLUETOOTH: Add and port the BT HCI SMD driver
|
||||
|
||||
Change-Id: I19e3cd2c7043d192590e4f81af6f8a18c9513d5e
|
||||
---
|
||||
drivers/bluetooth/Kconfig | 10 +
|
||||
drivers/bluetooth/Makefile | 1 +
|
||||
drivers/bluetooth/hci_smd.c | 678 +++++++++++++++++++++++++++++++
|
||||
include/net/bluetooth/hci.h | 1 +
|
||||
include/net/bluetooth/hci_core.h | 3 +
|
||||
5 files changed, 693 insertions(+)
|
||||
create mode 100644 drivers/bluetooth/hci_smd.c
|
||||
|
||||
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
|
||||
index d3d007014679..95903015e45e 100644
|
||||
--- a/drivers/bluetooth/Kconfig
|
||||
+++ b/drivers/bluetooth/Kconfig
|
||||
@@ -2,6 +2,16 @@
|
||||
menu "Bluetooth device drivers"
|
||||
depends on BT
|
||||
|
||||
+config BT_HCISMD
|
||||
+ tristate "HCI SMD driver"
|
||||
+ help
|
||||
+ Bluetooth HCI SMD driver.
|
||||
+ This driver is required if you want to use Bluetoth device with
|
||||
+ SMD interface.
|
||||
+
|
||||
+ Say Y here to compile support for Bluetooth USB devices into the
|
||||
+ kernel or say M to compile is as a module (hci_smd).
|
||||
+
|
||||
config BT_HCIBTUSB
|
||||
tristate "HCI USB driver"
|
||||
depends on USB
|
||||
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
|
||||
index d2e424bd273d..008ba6830e43 100644
|
||||
--- a/drivers/bluetooth/Makefile
|
||||
+++ b/drivers/bluetooth/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
# Makefile for the Linux Bluetooth HCI device drivers.
|
||||
#
|
||||
|
||||
+obj-$(CONFIG_BT_HCISMD) += hci_smd.o
|
||||
obj-$(CONFIG_BT_HCIVHCI) += hci_vhci.o
|
||||
obj-$(CONFIG_BT_HCIUART) += hci_uart.o
|
||||
obj-$(CONFIG_BT_HCIBCM203X) += bcm203x.o
|
||||
diff --git a/drivers/bluetooth/hci_smd.c b/drivers/bluetooth/hci_smd.c
|
||||
new file mode 100644
|
||||
index 000000000000..8e9a7505ff1f
|
||||
--- /dev/null
|
||||
+++ b/drivers/bluetooth/hci_smd.c
|
||||
@@ -0,0 +1,678 @@
|
||||
+/*
|
||||
+ * HCI_SMD (HCI Shared Memory Driver) is Qualcomm's Shared memory driver
|
||||
+ * for the BT HCI protocol.
|
||||
+ *
|
||||
+ * Copyright (c) 2000-2001, 2011-2012 The Linux Foundation. All rights reserved.
|
||||
+ * Copyright (C) 2002-2003 Maxim Krasnyansky <maxk@qualcomm.com>
|
||||
+ * Copyright (C) 2004-2006 Marcel Holtmann <marcel@holtmann.org>
|
||||
+ *
|
||||
+ * This file is based on drivers/bluetooth/hci_vhci.c
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License version 2
|
||||
+ * as published by the Free Software Foundation
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ */
|
||||
+
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/errno.h>
|
||||
+#include <linux/semaphore.h>
|
||||
+#include <linux/string.h>
|
||||
+#include <linux/skbuff.h>
|
||||
+#include <linux/wakelock.h>
|
||||
+#include <linux/workqueue.h>
|
||||
+#include <linux/uaccess.h>
|
||||
+#include <linux/interrupt.h>
|
||||
+#include <net/bluetooth/bluetooth.h>
|
||||
+#include <net/bluetooth/hci_core.h>
|
||||
+#include <net/bluetooth/hci.h>
|
||||
+#include <soc/qcom/smd.h>
|
||||
+
|
||||
+#define EVENT_CHANNEL "APPS_RIVA_BT_CMD"
|
||||
+#define DATA_CHANNEL "APPS_RIVA_BT_ACL"
|
||||
+/* release wakelock in 500ms, not immediately, because higher layers
|
||||
+ * don't always take wakelocks when they should
|
||||
+ * This is derived from the implementation for UART transport
|
||||
+ */
|
||||
+
|
||||
+#define RX_Q_MONITOR (500) /* 500 milli second */
|
||||
+#define HCI_REGISTER_SET 0
|
||||
+
|
||||
+/* SSR state machine to take care of back to back SSR requests
|
||||
+ * and handling the incomming BT on/off,Airplane mode toggling and
|
||||
+ * also spuriour SMD open notification while one SSr is in progress
|
||||
+ */
|
||||
+#define STATE_SSR_ON 0x1
|
||||
+#define STATE_SSR_START 0x02
|
||||
+#define STATE_SSR_CHANNEL_OPEN_PENDING 0x04
|
||||
+#define STATE_SSR_PENDING_INIT 0x08
|
||||
+#define STATE_SSR_COMPLETE 0x00
|
||||
+#define STATE_SSR_OFF STATE_SSR_COMPLETE
|
||||
+
|
||||
+static int ssr_state = STATE_SSR_OFF;
|
||||
+
|
||||
+
|
||||
+static int hcismd_set;
|
||||
+static DEFINE_SEMAPHORE(hci_smd_enable);
|
||||
+
|
||||
+static int restart_in_progress;
|
||||
+
|
||||
+static int hcismd_set_enable(const char *val, struct kernel_param *kp);
|
||||
+module_param_call(hcismd_set, hcismd_set_enable, NULL, &hcismd_set, 0644);
|
||||
+
|
||||
+static void hci_dev_smd_open(struct work_struct *worker);
|
||||
+static void hci_dev_restart(struct work_struct *worker);
|
||||
+
|
||||
+struct hci_smd_data {
|
||||
+ struct hci_dev *hdev;
|
||||
+ unsigned long flags;
|
||||
+ struct smd_channel *event_channel;
|
||||
+ struct smd_channel *data_channel;
|
||||
+ struct wake_lock wake_lock_tx;
|
||||
+ struct wake_lock wake_lock_rx;
|
||||
+ struct timer_list rx_q_timer;
|
||||
+ struct tasklet_struct rx_task;
|
||||
+};
|
||||
+static struct hci_smd_data hs;
|
||||
+
|
||||
+/* Rx queue monitor timer function */
|
||||
+static int is_rx_q_empty(unsigned long arg)
|
||||
+{
|
||||
+ struct hci_dev *hdev = (struct hci_dev *) arg;
|
||||
+ struct sk_buff_head *list_ = &hdev->rx_q;
|
||||
+ struct sk_buff *list = ((struct sk_buff *)list_)->next;
|
||||
+ BT_DBG("%s Rx timer triggered", hdev->name);
|
||||
+
|
||||
+ if (list == (struct sk_buff *)list_) {
|
||||
+ BT_DBG("%s RX queue empty", hdev->name);
|
||||
+ return 1;
|
||||
+ } else{
|
||||
+ BT_DBG("%s RX queue not empty", hdev->name);
|
||||
+ return 0;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void release_lock(void)
|
||||
+{
|
||||
+ struct hci_smd_data *hsmd = &hs;
|
||||
+ BT_DBG("Releasing Rx Lock");
|
||||
+ if (is_rx_q_empty((unsigned long)hsmd->hdev) &&
|
||||
+ wake_lock_active(&hs.wake_lock_rx))
|
||||
+ wake_unlock(&hs.wake_lock_rx);
|
||||
+}
|
||||
+
|
||||
+/* Rx timer callback function */
|
||||
+static void schedule_timer(unsigned long arg)
|
||||
+{
|
||||
+ struct hci_dev *hdev = (struct hci_dev *) arg;
|
||||
+ struct hci_smd_data *hsmd = &hs;
|
||||
+ BT_DBG("%s Schedule Rx timer", hdev->name);
|
||||
+
|
||||
+ if (is_rx_q_empty(arg) && wake_lock_active(&hs.wake_lock_rx)) {
|
||||
+ BT_DBG("%s RX queue empty", hdev->name);
|
||||
+ /*
|
||||
+ * Since the queue is empty, its ideal
|
||||
+ * to release the wake lock on Rx
|
||||
+ */
|
||||
+ wake_unlock(&hs.wake_lock_rx);
|
||||
+ } else{
|
||||
+ BT_DBG("%s RX queue not empty", hdev->name);
|
||||
+ /*
|
||||
+ * Restart the timer to monitor whether the Rx queue is
|
||||
+ * empty for releasing the Rx wake lock
|
||||
+ */
|
||||
+ mod_timer(&hsmd->rx_q_timer,
|
||||
+ jiffies + msecs_to_jiffies(RX_Q_MONITOR));
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static int hci_smd_open(struct hci_dev *hdev)
|
||||
+{
|
||||
+ set_bit(HCI_RUNNING, &hdev->flags);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static int hci_smd_close(struct hci_dev *hdev)
|
||||
+{
|
||||
+ if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))
|
||||
+ return 0;
|
||||
+ else
|
||||
+ return -EPERM;
|
||||
+}
|
||||
+
|
||||
+#if 0
|
||||
+static void hci_smd_destruct(struct hci_dev *hdev)
|
||||
+{
|
||||
+ if (NULL != hdev->driver_data)
|
||||
+ kfree(hdev->driver_data);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+static void hci_smd_recv_data(void)
|
||||
+{
|
||||
+ int len = 0;
|
||||
+ int rc = 0;
|
||||
+ struct sk_buff *skb = NULL;
|
||||
+ struct hci_smd_data *hsmd = &hs;
|
||||
+ wake_lock(&hs.wake_lock_rx);
|
||||
+
|
||||
+ len = smd_read_avail(hsmd->data_channel);
|
||||
+ if (len > HCI_MAX_FRAME_SIZE) {
|
||||
+ BT_ERR("Frame larger than the allowed size, flushing frame");
|
||||
+ smd_read(hsmd->data_channel, NULL, len);
|
||||
+ goto out_data;
|
||||
+ }
|
||||
+
|
||||
+ if (len <= 0)
|
||||
+ goto out_data;
|
||||
+
|
||||
+ skb = bt_skb_alloc(len, GFP_ATOMIC);
|
||||
+ if (!skb) {
|
||||
+ BT_ERR("Error in allocating socket buffer");
|
||||
+ smd_read(hsmd->data_channel, NULL, len);
|
||||
+ goto out_data;
|
||||
+ }
|
||||
+
|
||||
+ rc = smd_read(hsmd->data_channel, skb_put(skb, len), len);
|
||||
+ if (rc < len) {
|
||||
+ BT_ERR("Error in reading from the channel");
|
||||
+ goto out_data;
|
||||
+ }
|
||||
+
|
||||
+ skb->dev = (void *)hsmd->hdev;
|
||||
+ bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;
|
||||
+ skb_orphan(skb);
|
||||
+
|
||||
+ rc = hci_recv_frame(hsmd->hdev, skb);
|
||||
+ if (rc < 0) {
|
||||
+ BT_ERR("Error in passing the packet to HCI Layer");
|
||||
+ /*
|
||||
+ * skb is getting freed in hci_recv_frame, making it
|
||||
+ * to null to avoid multiple access
|
||||
+ */
|
||||
+ skb = NULL;
|
||||
+ goto out_data;
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * Start the timer to monitor whether the Rx queue is
|
||||
+ * empty for releasing the Rx wake lock
|
||||
+ */
|
||||
+ BT_DBG("Rx Timer is starting");
|
||||
+ mod_timer(&hsmd->rx_q_timer,
|
||||
+ jiffies + msecs_to_jiffies(RX_Q_MONITOR));
|
||||
+
|
||||
+out_data:
|
||||
+ release_lock();
|
||||
+ if (rc)
|
||||
+ kfree_skb(skb);
|
||||
+}
|
||||
+
|
||||
+static void hci_smd_recv_event(void)
|
||||
+{
|
||||
+ int len = 0;
|
||||
+ int rc = 0;
|
||||
+ struct sk_buff *skb = NULL;
|
||||
+ struct hci_smd_data *hsmd = &hs;
|
||||
+ wake_lock(&hs.wake_lock_rx);
|
||||
+
|
||||
+ len = smd_read_avail(hsmd->event_channel);
|
||||
+ if (len > HCI_MAX_FRAME_SIZE) {
|
||||
+ BT_ERR("Frame larger than the allowed size, flushing frame");
|
||||
+ rc = smd_read(hsmd->event_channel, NULL, len);
|
||||
+ goto out_event;
|
||||
+ }
|
||||
+
|
||||
+ while (len > 0) {
|
||||
+ skb = bt_skb_alloc(len, GFP_ATOMIC);
|
||||
+ if (!skb) {
|
||||
+ BT_ERR("Error in allocating socket buffer");
|
||||
+ smd_read(hsmd->event_channel, NULL, len);
|
||||
+ goto out_event;
|
||||
+ }
|
||||
+
|
||||
+ rc = smd_read(hsmd->event_channel, skb_put(skb, len), len);
|
||||
+ if (rc < len) {
|
||||
+ BT_ERR("Error in reading from the event channel");
|
||||
+ goto out_event;
|
||||
+ }
|
||||
+
|
||||
+ skb->dev = (void *)hsmd->hdev;
|
||||
+ bt_cb(skb)->pkt_type = HCI_EVENT_PKT;
|
||||
+
|
||||
+ skb_orphan(skb);
|
||||
+
|
||||
+ rc = hci_recv_frame(hsmd->hdev, skb);
|
||||
+ if (rc < 0) {
|
||||
+ BT_ERR("Error in passing the packet to HCI Layer");
|
||||
+ /*
|
||||
+ * skb is getting freed in hci_recv_frame, making it
|
||||
+ * to null to avoid multiple access
|
||||
+ */
|
||||
+ skb = NULL;
|
||||
+ goto out_event;
|
||||
+ }
|
||||
+
|
||||
+ len = smd_read_avail(hsmd->event_channel);
|
||||
+ /*
|
||||
+ * Start the timer to monitor whether the Rx queue is
|
||||
+ * empty for releasing the Rx wake lock
|
||||
+ */
|
||||
+ BT_DBG("Rx Timer is starting");
|
||||
+ mod_timer(&hsmd->rx_q_timer,
|
||||
+ jiffies + msecs_to_jiffies(RX_Q_MONITOR));
|
||||
+ }
|
||||
+out_event:
|
||||
+ release_lock();
|
||||
+ if (rc)
|
||||
+ kfree_skb(skb);
|
||||
+}
|
||||
+
|
||||
+static int hci_smd_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
||||
+{
|
||||
+ int len;
|
||||
+ int avail;
|
||||
+ int ret = 0;
|
||||
+ wake_lock(&hs.wake_lock_tx);
|
||||
+
|
||||
+ switch (bt_cb(skb)->pkt_type) {
|
||||
+ case HCI_COMMAND_PKT:
|
||||
+ avail = smd_write_avail(hs.event_channel);
|
||||
+ if (!avail) {
|
||||
+ BT_ERR("No space available for smd frame");
|
||||
+ ret = -ENOSPC;
|
||||
+ }
|
||||
+ len = smd_write(hs.event_channel, skb->data, skb->len);
|
||||
+ if (len < skb->len) {
|
||||
+ BT_ERR("Failed to write Command %d", len);
|
||||
+ ret = -ENODEV;
|
||||
+ }
|
||||
+ break;
|
||||
+ case HCI_ACLDATA_PKT:
|
||||
+ case HCI_SCODATA_PKT:
|
||||
+ avail = smd_write_avail(hs.data_channel);
|
||||
+ if (!avail) {
|
||||
+ BT_ERR("No space available for smd frame");
|
||||
+ ret = -ENOSPC;
|
||||
+ }
|
||||
+ len = smd_write(hs.data_channel, skb->data, skb->len);
|
||||
+ if (len < skb->len) {
|
||||
+ BT_ERR("Failed to write Data %d", len);
|
||||
+ ret = -ENODEV;
|
||||
+ }
|
||||
+ break;
|
||||
+ default:
|
||||
+ BT_ERR("Uknown packet type");
|
||||
+ ret = -ENODEV;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ kfree_skb(skb);
|
||||
+ wake_unlock(&hs.wake_lock_tx);
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static void hci_smd_rx(unsigned long arg)
|
||||
+{
|
||||
+ struct hci_smd_data *hsmd = &hs;
|
||||
+
|
||||
+ while ((smd_read_avail(hsmd->event_channel) > 0) ||
|
||||
+ (smd_read_avail(hsmd->data_channel) > 0)) {
|
||||
+ hci_smd_recv_event();
|
||||
+ hci_smd_recv_data();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void hci_smd_notify_event(void *data, unsigned int event)
|
||||
+{
|
||||
+ struct hci_dev *hdev = hs.hdev;
|
||||
+ struct hci_smd_data *hsmd = &hs;
|
||||
+ struct work_struct *reset_worker;
|
||||
+ struct work_struct *open_worker;
|
||||
+
|
||||
+ int len = 0;
|
||||
+
|
||||
+ if (!hdev) {
|
||||
+ BT_ERR("Frame for unknown HCI device (hdev=NULL)");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ switch (event) {
|
||||
+ case SMD_EVENT_DATA:
|
||||
+ len = smd_read_avail(hsmd->event_channel);
|
||||
+ if (len > 0)
|
||||
+ tasklet_hi_schedule(&hs.rx_task);
|
||||
+ else if (len < 0)
|
||||
+ BT_ERR("Failed to read event from smd %d", len);
|
||||
+
|
||||
+ break;
|
||||
+ case SMD_EVENT_OPEN:
|
||||
+ BT_INFO("opening HCI-SMD channel :%s", EVENT_CHANNEL);
|
||||
+ BT_DBG("SSR state is : %x", ssr_state);
|
||||
+ if ((ssr_state == STATE_SSR_OFF) ||
|
||||
+ (ssr_state == STATE_SSR_CHANNEL_OPEN_PENDING)) {
|
||||
+
|
||||
+ hci_smd_open(hdev);
|
||||
+ open_worker = kzalloc(sizeof(*open_worker), GFP_ATOMIC);
|
||||
+ if (!open_worker) {
|
||||
+ BT_ERR("Out of memory");
|
||||
+ break;
|
||||
+ }
|
||||
+ if (ssr_state == STATE_SSR_CHANNEL_OPEN_PENDING) {
|
||||
+ ssr_state = STATE_SSR_PENDING_INIT;
|
||||
+ BT_INFO("SSR state is : %x", ssr_state);
|
||||
+ }
|
||||
+ INIT_WORK(open_worker, hci_dev_smd_open);
|
||||
+ schedule_work(open_worker);
|
||||
+
|
||||
+ }
|
||||
+ break;
|
||||
+ case SMD_EVENT_CLOSE:
|
||||
+ BT_INFO("Closing HCI-SMD channel :%s", EVENT_CHANNEL);
|
||||
+ BT_DBG("SSR state is : %x", ssr_state);
|
||||
+ if ((ssr_state == STATE_SSR_OFF) ||
|
||||
+ (ssr_state == (STATE_SSR_PENDING_INIT))) {
|
||||
+
|
||||
+ hci_smd_close(hdev);
|
||||
+ reset_worker = kzalloc(sizeof(*reset_worker),
|
||||
+ GFP_ATOMIC);
|
||||
+ if (!reset_worker) {
|
||||
+ BT_ERR("Out of memory");
|
||||
+ break;
|
||||
+ }
|
||||
+ ssr_state = STATE_SSR_ON;
|
||||
+ BT_INFO("SSR state is : %x", ssr_state);
|
||||
+ INIT_WORK(reset_worker, hci_dev_restart);
|
||||
+ schedule_work(reset_worker);
|
||||
+
|
||||
+ } else if (ssr_state & STATE_SSR_ON) {
|
||||
+ BT_ERR("SSR state is : %x", ssr_state);
|
||||
+ }
|
||||
+
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void hci_smd_notify_data(void *data, unsigned int event)
|
||||
+{
|
||||
+ struct hci_dev *hdev = hs.hdev;
|
||||
+ struct hci_smd_data *hsmd = &hs;
|
||||
+ int len = 0;
|
||||
+
|
||||
+ if (!hdev) {
|
||||
+ BT_ERR("Frame for unknown HCI device (hdev=NULL)");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ switch (event) {
|
||||
+ case SMD_EVENT_DATA:
|
||||
+ len = smd_read_avail(hsmd->data_channel);
|
||||
+ if (len > 0)
|
||||
+ tasklet_hi_schedule(&hs.rx_task);
|
||||
+ else if (len < 0)
|
||||
+ BT_ERR("Failed to read data from smd %d", len);
|
||||
+ break;
|
||||
+ case SMD_EVENT_OPEN:
|
||||
+ BT_INFO("opening HCI-SMD channel :%s", DATA_CHANNEL);
|
||||
+ hci_smd_open(hdev);
|
||||
+ break;
|
||||
+ case SMD_EVENT_CLOSE:
|
||||
+ BT_INFO("Closing HCI-SMD channel :%s", DATA_CHANNEL);
|
||||
+ hci_smd_close(hdev);
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+}
|
||||
+
|
||||
+static int hci_smd_hci_register_dev(struct hci_smd_data *hsmd)
|
||||
+{
|
||||
+ struct hci_dev *hdev;
|
||||
+
|
||||
+ if (hsmd->hdev)
|
||||
+ hdev = hsmd->hdev;
|
||||
+ else {
|
||||
+ BT_ERR("hdev is NULL");
|
||||
+ return 0;
|
||||
+ }
|
||||
+ /* Allow the incomming SSR even the prev one at PENDING INIT STATE
|
||||
+ * since clenup need to be started again from the beging and ignore
|
||||
+ * or bypass the prev one
|
||||
+ */
|
||||
+ if ((ssr_state == STATE_SSR_OFF) ||
|
||||
+ (ssr_state == STATE_SSR_PENDING_INIT)) {
|
||||
+
|
||||
+ if (test_and_set_bit(HCI_REGISTER_SET, &hsmd->flags)) {
|
||||
+ BT_ERR("HCI device registered already");
|
||||
+ return 0;
|
||||
+ } else
|
||||
+ BT_INFO("HCI device registration is starting");
|
||||
+ if (hci_register_dev(hdev) < 0) {
|
||||
+ BT_ERR("Can't register HCI device");
|
||||
+ hci_free_dev(hdev);
|
||||
+ hsmd->hdev = NULL;
|
||||
+ clear_bit(HCI_REGISTER_SET, &hsmd->flags);
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+ if (ssr_state == STATE_SSR_PENDING_INIT) {
|
||||
+ ssr_state = STATE_SSR_COMPLETE;
|
||||
+ BT_INFO("SSR state is : %x", ssr_state);
|
||||
+ }
|
||||
+ } else if (ssr_state)
|
||||
+ BT_ERR("Registration called in invalid context");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int hci_smd_register_smd(struct hci_smd_data *hsmd)
|
||||
+{
|
||||
+ struct hci_dev *hdev;
|
||||
+ int rc;
|
||||
+
|
||||
+ /* Initialize and register HCI device */
|
||||
+ hdev = hci_alloc_dev();
|
||||
+ if (!hdev) {
|
||||
+ BT_ERR("Can't allocate HCI device");
|
||||
+ return -ENOMEM;
|
||||
+ }
|
||||
+
|
||||
+ hsmd->hdev = hdev;
|
||||
+ hdev->bus = HCI_SMD;
|
||||
+ hdev->driver_data = NULL;
|
||||
+ hdev->open = hci_smd_open;
|
||||
+ hdev->close = hci_smd_close;
|
||||
+ hdev->send = hci_smd_send_frame;
|
||||
+ //hdev->destruct = hci_smd_destruct;
|
||||
+ hdev->owner = THIS_MODULE;
|
||||
+
|
||||
+
|
||||
+ tasklet_init(&hsmd->rx_task,
|
||||
+ hci_smd_rx, (unsigned long) hsmd);
|
||||
+ /*
|
||||
+ * Setup the timer to monitor whether the Rx queue is empty,
|
||||
+ * to control the wake lock release
|
||||
+ */
|
||||
+ setup_timer(&hsmd->rx_q_timer, schedule_timer,
|
||||
+ (unsigned long) hsmd->hdev);
|
||||
+ if (ssr_state == STATE_SSR_START) {
|
||||
+ ssr_state = STATE_SSR_CHANNEL_OPEN_PENDING;
|
||||
+ BT_INFO("SSR state is : %x", ssr_state);
|
||||
+ }
|
||||
+ /* Open the SMD Channel and device and register the callback function */
|
||||
+ rc = smd_named_open_on_edge(EVENT_CHANNEL, SMD_APPS_WCNSS,
|
||||
+ &hsmd->event_channel, hdev, hci_smd_notify_event);
|
||||
+ if (rc < 0) {
|
||||
+ BT_ERR("Cannot open the command channel");
|
||||
+ hci_free_dev(hdev);
|
||||
+ hsmd->hdev = NULL;
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ rc = smd_named_open_on_edge(DATA_CHANNEL, SMD_APPS_WCNSS,
|
||||
+ &hsmd->data_channel, hdev, hci_smd_notify_data);
|
||||
+ if (rc < 0) {
|
||||
+ BT_ERR("Failed to open the Data channel");
|
||||
+ hci_free_dev(hdev);
|
||||
+ hsmd->hdev = NULL;
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ /* Disable the read interrupts on the channel */
|
||||
+ smd_disable_read_intr(hsmd->event_channel);
|
||||
+ smd_disable_read_intr(hsmd->data_channel);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void hci_smd_deregister_dev(struct hci_smd_data *hsmd)
|
||||
+{
|
||||
+ tasklet_kill(&hs.rx_task);
|
||||
+ if (ssr_state)
|
||||
+ BT_DBG("SSR state is : %x", ssr_state);
|
||||
+ /* Though the hci_smd driver is not registered with the hci
|
||||
+ * need to close the opened channels as a part of cleaup
|
||||
+ */
|
||||
+ if (!test_and_clear_bit(HCI_REGISTER_SET, &hsmd->flags)) {
|
||||
+ BT_ERR("HCI device un-registered already");
|
||||
+ } else {
|
||||
+ BT_INFO("HCI device un-registration going on");
|
||||
+
|
||||
+ if (hsmd->hdev) {
|
||||
+ hci_unregister_dev(hsmd->hdev) ;
|
||||
+ hci_free_dev(hsmd->hdev);
|
||||
+ hsmd->hdev = NULL;
|
||||
+ }
|
||||
+ }
|
||||
+ smd_close(hs.event_channel);
|
||||
+ smd_close(hs.data_channel);
|
||||
+
|
||||
+ if (wake_lock_active(&hs.wake_lock_rx))
|
||||
+ wake_unlock(&hs.wake_lock_rx);
|
||||
+ if (wake_lock_active(&hs.wake_lock_tx))
|
||||
+ wake_unlock(&hs.wake_lock_tx);
|
||||
+
|
||||
+ /*Destroy the timer used to monitor the Rx queue for emptiness */
|
||||
+ if (hs.rx_q_timer.function) {
|
||||
+ del_timer_sync(&hs.rx_q_timer);
|
||||
+ hs.rx_q_timer.function = NULL;
|
||||
+ hs.rx_q_timer.data = 0;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void hci_dev_restart(struct work_struct *worker)
|
||||
+{
|
||||
+ down(&hci_smd_enable);
|
||||
+ restart_in_progress = 1;
|
||||
+ BT_DBG("SSR state is : %x", ssr_state);
|
||||
+
|
||||
+ if (ssr_state == STATE_SSR_ON) {
|
||||
+ ssr_state = STATE_SSR_START;
|
||||
+ BT_INFO("SSR state is : %x", ssr_state);
|
||||
+ } else {
|
||||
+ BT_ERR("restart triggered in wrong context");
|
||||
+ up(&hci_smd_enable);
|
||||
+ kfree(worker);
|
||||
+ return;
|
||||
+ }
|
||||
+ hci_smd_deregister_dev(&hs);
|
||||
+ hci_smd_register_smd(&hs);
|
||||
+ up(&hci_smd_enable);
|
||||
+ kfree(worker);
|
||||
+
|
||||
+}
|
||||
+
|
||||
+static void hci_dev_smd_open(struct work_struct *worker)
|
||||
+{
|
||||
+ down(&hci_smd_enable);
|
||||
+ if (ssr_state)
|
||||
+ BT_DBG("SSR state is : %x", ssr_state);
|
||||
+
|
||||
+ if ((ssr_state != STATE_SSR_OFF) &&
|
||||
+ (ssr_state != (STATE_SSR_PENDING_INIT))) {
|
||||
+ up(&hci_smd_enable);
|
||||
+ kfree(worker);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (restart_in_progress == 1) {
|
||||
+ /* Allow wcnss to initialize */
|
||||
+ restart_in_progress = 0;
|
||||
+ msleep(10000);
|
||||
+ }
|
||||
+
|
||||
+ hci_smd_hci_register_dev(&hs);
|
||||
+ up(&hci_smd_enable);
|
||||
+ kfree(worker);
|
||||
+
|
||||
+}
|
||||
+
|
||||
+static int hcismd_set_enable(const char *val, struct kernel_param *kp)
|
||||
+{
|
||||
+ int ret = 0;
|
||||
+
|
||||
+ pr_err("hcismd_set_enable %d", hcismd_set);
|
||||
+
|
||||
+ down(&hci_smd_enable);
|
||||
+
|
||||
+ ret = param_set_int(val, kp);
|
||||
+
|
||||
+ if (ret)
|
||||
+ goto done;
|
||||
+
|
||||
+ /* Ignore the all incomming register de-register requests in case of
|
||||
+ * SSR is in-progress
|
||||
+ */
|
||||
+ switch (hcismd_set) {
|
||||
+
|
||||
+ case 1:
|
||||
+ if ((hs.hdev == NULL) && (ssr_state == STATE_SSR_OFF))
|
||||
+ hci_smd_register_smd(&hs);
|
||||
+ else if (ssr_state)
|
||||
+ BT_ERR("SSR is in progress,state is : %x", ssr_state);
|
||||
+
|
||||
+ break;
|
||||
+ case 0:
|
||||
+ if (ssr_state == STATE_SSR_OFF)
|
||||
+ hci_smd_deregister_dev(&hs);
|
||||
+ else if (ssr_state)
|
||||
+ BT_ERR("SSR is in progress,state is : %x", ssr_state);
|
||||
+ break;
|
||||
+ default:
|
||||
+ ret = -EFAULT;
|
||||
+ }
|
||||
+
|
||||
+done:
|
||||
+ up(&hci_smd_enable);
|
||||
+ return ret;
|
||||
+}
|
||||
+static int __init hci_smd_init(void)
|
||||
+{
|
||||
+ wake_lock_init(&hs.wake_lock_rx, WAKE_LOCK_SUSPEND,
|
||||
+ "msm_smd_Rx");
|
||||
+ wake_lock_init(&hs.wake_lock_tx, WAKE_LOCK_SUSPEND,
|
||||
+ "msm_smd_Tx");
|
||||
+ restart_in_progress = 0;
|
||||
+ ssr_state = STATE_SSR_OFF;
|
||||
+ hs.hdev = NULL;
|
||||
+ return 0;
|
||||
+}
|
||||
+module_init(hci_smd_init);
|
||||
+
|
||||
+static void __exit hci_smd_exit(void)
|
||||
+{
|
||||
+ wake_lock_destroy(&hs.wake_lock_rx);
|
||||
+ wake_lock_destroy(&hs.wake_lock_tx);
|
||||
+}
|
||||
+module_exit(hci_smd_exit);
|
||||
+
|
||||
+MODULE_AUTHOR("Ankur Nandwani <ankurn@codeaurora.org>");
|
||||
+MODULE_DESCRIPTION("Bluetooth SMD driver");
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
|
||||
index cb8d4b314bcf..84e041e99f78 100644
|
||||
--- a/include/net/bluetooth/hci.h
|
||||
+++ b/include/net/bluetooth/hci.h
|
||||
@@ -59,6 +59,7 @@
|
||||
#define HCI_RS232 4
|
||||
#define HCI_PCI 5
|
||||
#define HCI_SDIO 6
|
||||
+#define HCI_SMD 7
|
||||
|
||||
/* HCI controller types */
|
||||
#define HCI_BREDR 0x00
|
||||
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
|
||||
index b1980ccdd6ee..a2c759045bfc 100644
|
||||
--- a/include/net/bluetooth/hci_core.h
|
||||
+++ b/include/net/bluetooth/hci_core.h
|
||||
@@ -349,6 +349,9 @@ struct hci_dev {
|
||||
struct delayed_work rpa_expired;
|
||||
bdaddr_t rpa;
|
||||
|
||||
+ void *driver_data;
|
||||
+ struct module *owner;
|
||||
+
|
||||
int (*open)(struct hci_dev *hdev);
|
||||
int (*close)(struct hci_dev *hdev);
|
||||
int (*flush)(struct hci_dev *hdev);
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,89 +0,0 @@
|
||||
From 408331eace24ef1ee4e830502b3355799122c984 Mon Sep 17 00:00:00 2001
|
||||
From: Danct12 <danct12@disroot.org>
|
||||
Date: Fri, 3 May 2019 01:19:24 +0700
|
||||
Subject: [PATCH] Disable substream runtime not found errors
|
||||
|
||||
---
|
||||
sound/soc/msm/qdsp6v2/msm-pcm-loopback-v2.c | 4 ++--
|
||||
sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c | 4 ++--
|
||||
sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c | 6 +++---
|
||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-loopback-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-loopback-v2.c
|
||||
index 827d079d3968..eff8244065a9 100644
|
||||
--- a/sound/soc/msm/qdsp6v2/msm-pcm-loopback-v2.c
|
||||
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-loopback-v2.c
|
||||
@@ -490,7 +490,7 @@ static int msm_pcm_volume_ctl_put(struct snd_kcontrol *kcontrol,
|
||||
|
||||
pr_debug("%s: volume : 0x%x\n", __func__, volume);
|
||||
if ((!substream) || (!substream->runtime)) {
|
||||
- pr_err("%s substream or runtime not found\n", __func__);
|
||||
+ //pr_err("%s substream or runtime not found\n", __func__);
|
||||
rc = -ENODEV;
|
||||
goto exit;
|
||||
}
|
||||
@@ -516,7 +516,7 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol,
|
||||
|
||||
pr_debug("%s\n", __func__);
|
||||
if ((!substream) || (!substream->runtime)) {
|
||||
- pr_err("%s substream or runtime not found\n", __func__);
|
||||
+ //pr_err("%s substream or runtime not found\n", __func__);
|
||||
rc = -ENODEV;
|
||||
goto exit;
|
||||
}
|
||||
diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c b/sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c
|
||||
index 289049c7fac2..a256bd1c7bf1 100644
|
||||
--- a/sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c
|
||||
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c
|
||||
@@ -579,7 +579,7 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol,
|
||||
return -ENODEV;
|
||||
}
|
||||
if (!substream->runtime) {
|
||||
- pr_err("%s substream runtime not found\n", __func__);
|
||||
+ //pr_err("%s substream runtime not found\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
prtd = substream->runtime->private_data;
|
||||
@@ -604,7 +604,7 @@ static int msm_pcm_volume_ctl_put(struct snd_kcontrol *kcontrol,
|
||||
return -ENODEV;
|
||||
}
|
||||
if (!substream->runtime) {
|
||||
- pr_err("%s substream runtime not found\n", __func__);
|
||||
+ //pr_err("%s substream runtime not found\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
prtd = substream->runtime->private_data;
|
||||
diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c
|
||||
index e505f416ab2c..7f2fe3b55b98 100644
|
||||
--- a/sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c
|
||||
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c
|
||||
@@ -1137,7 +1137,7 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol,
|
||||
return -ENODEV;
|
||||
}
|
||||
if (!substream->runtime) {
|
||||
- pr_err("%s substream runtime not found\n", __func__);
|
||||
+ //pr_err("%s substream runtime not found\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
prtd = substream->runtime->private_data;
|
||||
@@ -1162,7 +1162,7 @@ static int msm_pcm_volume_ctl_put(struct snd_kcontrol *kcontrol,
|
||||
return -ENODEV;
|
||||
}
|
||||
if (!substream->runtime) {
|
||||
- pr_err("%s substream runtime not found\n", __func__);
|
||||
+ //pr_err("%s substream runtime not found\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
prtd = substream->runtime->private_data;
|
||||
@@ -1682,7 +1682,7 @@ static int msm_pcm_chmix_cfg_ctl_put(struct snd_kcontrol *kcontrol,
|
||||
return -ENODEV;
|
||||
}
|
||||
if (!substream->runtime) {
|
||||
- pr_err("%s substream runtime not found\n", __func__);
|
||||
+ //pr_err("%s substream runtime not found\n", __func__);
|
||||
ret = -EINVAL;
|
||||
goto done;
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
From f3ed0c110153e63884e38aa20bc6a352b647b47d Mon Sep 17 00:00:00 2001
|
||||
From: Ion Agorria <ion@agorria.com>
|
||||
Date: Thu, 24 Jan 2019 18:52:58 +0100
|
||||
Subject: [PATCH] mdss: update fb mode at mdss_panelinfo_to_fb_var to fix Xorg
|
||||
|
||||
When mdss_panelinfo_to_fb_var is called at
|
||||
screen unblank it updates the values in fb_info->var,
|
||||
meanwhile the fb_info->mode and modelist remain with old
|
||||
values set at registering the fb causing mismatch when
|
||||
Xorg attempts to set mode.
|
||||
---
|
||||
drivers/video/msm/mdss/mdss_fb.c | 25 ++++++++++++++++-------
|
||||
drivers/video/msm/mdss/mdss_fb.h | 3 +--
|
||||
drivers/video/msm/mdss/mdss_mdp_overlay.c | 2 +-
|
||||
3 files changed, 20 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
|
||||
index fbcec438dbc4..3302afc7120a 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_fb.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_fb.c
|
||||
@@ -1851,7 +1851,7 @@ static void mdss_panel_validate_debugfs_info(struct msm_fb_data_type *mfd)
|
||||
if (is_panel_split(mfd) && pdata->next)
|
||||
mdss_fb_validate_split(pdata->panel_info.xres,
|
||||
pdata->next->panel_info.xres, mfd);
|
||||
- mdss_panelinfo_to_fb_var(panel_info, var);
|
||||
+ mdss_panelinfo_to_fb_var(mfd);
|
||||
if (mdss_fb_send_panel_event(mfd, MDSS_EVENT_CHECK_PARAMS,
|
||||
panel_info))
|
||||
pr_err("Failed to send panel event CHECK_PARAMS\n");
|
||||
@@ -1964,7 +1964,7 @@ static int mdss_fb_blank_unblank(struct msm_fb_data_type *mfd)
|
||||
* programmed in the controller.
|
||||
* Update this info in the upstream structs.
|
||||
*/
|
||||
- mdss_panelinfo_to_fb_var(panel_info, var);
|
||||
+ mdss_panelinfo_to_fb_var(mfd);
|
||||
|
||||
/* Start the work thread to signal idle time */
|
||||
if (mfd->idle_time)
|
||||
@@ -2696,7 +2696,7 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
|
||||
return ret;
|
||||
}
|
||||
|
||||
- mdss_panelinfo_to_fb_var(panel_info, var);
|
||||
+ mdss_panelinfo_to_fb_var(mfd);
|
||||
|
||||
fix->type = panel_info->is_3d_panel;
|
||||
if (mfd->mdp.fb_stride)
|
||||
@@ -3408,7 +3408,7 @@ static void mdss_fb_update_resolution(struct msm_fb_data_type *mfd,
|
||||
}
|
||||
var->xres_virtual = var->xres;
|
||||
var->yres_virtual = pinfo->yres * mfd->fb_page;
|
||||
- mdss_panelinfo_to_fb_var(pinfo, var);
|
||||
+ mdss_panelinfo_to_fb_var(mfd);
|
||||
}
|
||||
|
||||
int mdss_fb_atomic_commit(struct fb_info *info,
|
||||
@@ -3630,9 +3630,14 @@ static void mdss_fb_var_to_panelinfo(struct fb_var_screeninfo *var,
|
||||
pinfo->mipi.dsi_pclk_rate = pinfo->clk_rate;
|
||||
}
|
||||
|
||||
-void mdss_panelinfo_to_fb_var(struct mdss_panel_info *pinfo,
|
||||
- struct fb_var_screeninfo *var)
|
||||
+void mdss_panelinfo_to_fb_var(struct msm_fb_data_type *mfd)
|
||||
{
|
||||
+ if (!mfd)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ struct mdss_panel_info *pinfo = mfd->panel_info;
|
||||
+ struct fb_info *fbi = mfd->fbi;
|
||||
+ struct fb_var_screeninfo *var = &fbi->var;
|
||||
u32 frame_rate;
|
||||
|
||||
var->xres = mdss_fb_get_panel_xres(pinfo);
|
||||
@@ -3667,7 +3672,13 @@ void mdss_panelinfo_to_fb_var(struct mdss_panel_info *pinfo,
|
||||
if (pinfo->physical_height)
|
||||
var->height = pinfo->physical_height;
|
||||
|
||||
- pr_debug("ScreenInfo: res=%dx%d [%d, %d] [%d, %d]\n",
|
||||
+ //Hack to update current fbi->mode according to fbi->var when var is updated from panel info
|
||||
+ if (fbi->mode) {
|
||||
+ printk("Updating mdss fb mode from fb var\n");
|
||||
+ fb_var_to_videomode(fbi->mode, var);
|
||||
+ }
|
||||
+
|
||||
+ printk("ScreenInfo: res=%dx%d [%d, %d] [%d, %d]\n",
|
||||
var->xres, var->yres, var->left_margin,
|
||||
var->right_margin, var->upper_margin,
|
||||
var->lower_margin);
|
||||
diff --git a/drivers/video/msm/mdss/mdss_fb.h b/drivers/video/msm/mdss/mdss_fb.h
|
||||
index 7bc2afd09646..3ea0c6426485 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_fb.h
|
||||
+++ b/drivers/video/msm/mdss/mdss_fb.h
|
||||
@@ -471,7 +471,6 @@ int mdss_fb_async_position_update(struct fb_info *info,
|
||||
|
||||
u32 mdss_fb_get_mode_switch(struct msm_fb_data_type *mfd);
|
||||
void mdss_fb_report_panel_dead(struct msm_fb_data_type *mfd);
|
||||
-void mdss_panelinfo_to_fb_var(struct mdss_panel_info *pinfo,
|
||||
- struct fb_var_screeninfo *var);
|
||||
+void mdss_panelinfo_to_fb_var(struct msm_fb_data_type *mfd);
|
||||
void mdss_fb_calc_fps(struct msm_fb_data_type *mfd);
|
||||
#endif /* MDSS_FB_H */
|
||||
diff --git a/drivers/video/msm/mdss/mdss_mdp_overlay.c b/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
||||
index 0a99acba594b..c998d26211d4 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
||||
@@ -3844,7 +3844,7 @@ int mdss_mdp_dfps_update_params(struct msm_fb_data_type *mfd,
|
||||
* data, so any further call to get the screen
|
||||
* info has the updated timings.
|
||||
*/
|
||||
- mdss_panelinfo_to_fb_var(&pdata->panel_info, var);
|
||||
+ mdss_panelinfo_to_fb_var(mfd);
|
||||
|
||||
MDSS_XLOG(dfps);
|
||||
mutex_unlock(&mdp5_data->dfps_lock);
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch
|
||||
Reference in New Issue
Block a user