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 0054aad..867ae57 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -140,17 +140,19 @@ 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 ro.hardware.hwcomposer ${HWC:-drm}
+                               set_property ro.hardware.gralloc ${GRALLOC:-gbm}
                                set_property debug.drm.mode.force ${video:-1280x800}
                        fi
                        ;;
                0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
                        if [ "$HWACCEL" != "0" ]; then
-                               set_property ro.hardware.gralloc drm
+                               set_property ro.hardware.gralloc ${GRALLOC:-drm}
                                set_drm_mode
                        fi
                        ;;
@@ -197,9 +199,12 @@ function init_hal_power()
 
        # TODO
        case "$PRODUCT" in
-               HP*Omni*|OEMB|Standard*PC*|Surface*3|T10*TA)
+               HP*Omni*|OEMB|Standard*PC*|Surface*3|T10*TA|VMware*)
                        set_prop_if_empty sleep.state none
                        ;;
+               e-tab*Pro)
+                       set_prop_if_empty sleep.state force
+                       ;;
                *)
                        ;;
        esac
@@ -270,6 +275,9 @@ function init_hal_sensors()
                        modprobe hdaps
                        hal_sensors=hdaps
                        ;;
+               *e-tabPro*)
+                       set_property ro.iio.accel.quirks no-trig
+                       ;&
                *i7Stylus*|*M80TA*)
                        set_property ro.iio.accel.x.opt_scale -1
                        ;;
@@ -281,7 +289,10 @@ function init_hal_sensors()
                *ST70416-6*)
                        set_property ro.iio.accel.order 102
                        ;;
-               *T*0*TA*|*pnEZpad*)
+               *pnEZpad*)
+                       set_property ro.iio.accel.quirks no-trig
+                       ;&
+               *T*0*TA*)
                        set_property ro.iio.accel.y.opt_scale -1
                        ;;
                *)