Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

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

diff --git a/init.sh b/init.sh
index 0cc9f06..14d5d34 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -38,13 +38,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()
@@ -118,10 +115,8 @@ function set_drm_mode()
                ET1602*)
                        drm_mode=1366x768
                        ;;
-               VMware*)
-                       [ -n "$video" ] && drm_mode=$video
-                       ;;
                *)
+                       [ -n "$video" ] && drm_mode=$video
                        ;;
        esac
 
@@ -130,6 +125,8 @@ function set_drm_mode()
 
 function init_uvesafb()
 {
+       UVESA_MODE=${UVESA_MODE:-${video%@*}}
+
        case "$PRODUCT" in
                ET2002*)
                        UVESA_MODE=${UVESA_MODE:-1600x900}
@@ -148,8 +145,8 @@ function init_hal_gralloc()
                        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)
                        if [ "$HWACCEL" != "0" ]; then
@@ -186,7 +183,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)
                        set_prop_if_empty sleep.state none
                        ;;
                *)
@@ -420,6 +417,12 @@ function do_bootcomplete()
                        setkeycodes 0x66 172
                        setkeycodes 0x6b 127
                        ;;
+               Surface*Go)
+                       echo on > /sys/devices/pci0000:00/0000:00:15.1/i2c_designware.1/power/control
+                       ;;
+               VMware*)
+                       pm disable com.android.bluetooth
+                       ;;
                *)
                        ;;
        esac