Merge remote-tracking branch 'x86/pie-x86' into q-x86

[android-x86/device-generic-common.git] / init.sh

diff --git a/init.sh b/init.sh
index 5d342e3..8ecd243 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -66,13 +66,10 @@ function init_hal_audio()
                VirtualBox*|Bochs*)
                        [ -d /proc/asound/card0 ] || modprobe snd-sb16 isapnp=0 irq=5
                        ;;
-               *)
+               TS10*)
+                       set_prop_if_empty hal.audio.out pcmC0D2p
                        ;;
        esac
-
-       if grep -qi "IntelHDMI" /proc/asound/card0/id; then
-               [ -d /proc/asound/card1 ] || set_property ro.hardware.audio.primary hdmi
-       fi
 }
 
 function init_hal_bluetooth()
@@ -182,18 +179,18 @@ function init_uvesafb()
 
 function init_hal_gralloc()
 {
+       [ "$VULKAN" = "1" ] && GRALLOC=gbm
+
        case "$(cat /proc/fb | head -1)" in
-               *virtiodrmfb)
-                       if [ "$HWACCEL" != "0" ]; then
-                               set_property ro.hardware.hwcomposer drm
-                               set_property ro.hardware.gralloc gbm
-                               set_property debug.drm.mode.force ${video:-1280x800}
-                       fi
-                       set_prop_if_empty sleep.state none
-                       ;;
-               0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
+               *virtio*drmfb|*DRM*emulated)
+                       HWC=${HWC:-drm}
+                       GRALLOC=${GRALLOC:-gbm}
+                       video=${video:-1280x768}
+                       ;&
+               0*i915drmfb|0*inteldrmfb|0*radeondrmfb|0*nouveau*|0*svgadrmfb|0*amdgpudrmfb)
                        if [ "$HWACCEL" != "0" ]; then
-                               set_property ro.hardware.gralloc drm
+                               set_property ro.hardware.hwcomposer ${HWC:-}
+                               set_property ro.hardware.gralloc ${GRALLOC:-drm}
                                set_drm_mode
                        fi
                        ;;
@@ -204,6 +201,7 @@ function init_hal_gralloc()
                        ;;
        esac
 
+       [ -z "$(getprop ro.hardware.gralloc)" ] && set_property ro.hardware.egl swiftshader
        [ -n "$DEBUG" ] && set_property debug.egl.trace error
 }
 
@@ -213,6 +211,20 @@ function init_hal_hwcomposer()
        return
 }
 
+function init_hal_vulkan()
+{
+       case "$(cat /proc/fb | head -1)" in
+               0*i915drmfb|0*inteldrmfb)
+                       set_property ro.hardware.vulkan android-x86
+                       ;;
+               0*amdgpudrmfb)
+                       set_property ro.hardware.vulkan radv
+                       ;;
+               *)
+                       ;;
+       esac
+}
+
 function init_hal_lights()
 {
        chown 1000.1000 /sys/class/backlight/*/brightness
@@ -226,7 +238,7 @@ function init_hal_power()
 
        # TODO
        case "$PRODUCT" in
-               HP*Omni*|OEMB|Surface*3|T10*TA)
+               HP*Omni*|OEMB|Standard*PC*|Surface*3|T10*TA|VMware*)
                        set_prop_if_empty sleep.state none
                        ;;
                e-tab*Pro)
@@ -425,6 +437,7 @@ function do_init()
        init_hal_gps
        init_hal_gralloc
        init_hal_hwcomposer
+       init_hal_vulkan
        init_hal_lights
        init_hal_power
        init_hal_sensors
@@ -483,6 +496,9 @@ function do_bootcomplete()
                Surface*Go)
                        echo on > /sys/devices/pci0000:00/0000:00:15.1/i2c_designware.1/power/control
                        ;;
+               VMware*)
+                       pm disable com.android.bluetooth
+                       ;;
                X80*Power)
                        set_property power.nonboot-cpu-off 1
                        ;;
@@ -504,7 +520,7 @@ function do_bootcomplete()
                        alsa_amixer -c $c set Speaker 100%
                        alsa_amixer -c $c set Capture 80%
                        alsa_amixer -c $c set Capture cap
-                       alsa_amixer -c $c set PCM 100 unmute
+                       alsa_amixer -c $c set PCM 100% unmute
                        alsa_amixer -c $c set SPO unmute
                        alsa_amixer -c $c set IEC958 on
                        alsa_amixer -c $c set 'Mic Boost' 1
@@ -533,8 +549,13 @@ for c in `cat /proc/cmdline`; do
                                case $c in
                                        DEBUG=*)
                                                [ -n "$DEBUG" ] && set_property debug.logcat 1
+                                               [ "$DEBUG" = "0" ] || SETUPWIZARD=${SETUPWIZARD:-0}
+                                               ;;
+                                       DPI=*)
+                                               set_property ro.sf.lcd_density "$DPI"
                                                ;;
                                esac
+                               [ "$SETUPWIZARD" = "0" ] && set_property ro.setupwizard.mode DISABLED
                        fi
                        ;;
        esac