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 ab7f50d..673f4e1 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -178,15 +178,16 @@ function init_hal_gralloc()
        [ "$VULKAN" = "1" ] && GRALLOC=gbm
 
        case "$(cat /proc/fb | head -1)" in
-               *virtiodrmfb)
+               *virtiodrmfb|*DRM*emulated)
                        if [ "$HWACCEL" != "0" ]; then
                                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)
+               0*i915drmfb|0*inteldrmfb|0*radeondrmfb|0*nouveau*|0*svgadrmfb|0*amdgpudrmfb)
                        if [ "$HWACCEL" != "0" ]; then
+                               set_property ro.hardware.hwcomposer ${HWC:-}
                                set_property ro.hardware.gralloc ${GRALLOC:-drm}
                                set_drm_mode
                        fi
@@ -198,6 +199,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
 }
 
@@ -210,7 +212,7 @@ function init_hal_hwcomposer()
 function init_hal_vulkan()
 {
        case "$(cat /proc/fb | head -1)" in
-               0*inteldrmfb)
+               0*i915drmfb|0*inteldrmfb)
                        set_property ro.hardware.vulkan android-x86
                        ;;
                0*amdgpudrmfb)
@@ -311,9 +313,13 @@ function init_hal_sensors()
                        hal_sensors=hdaps
                        ;;
                *LINX1010B*)
+                       set_property ro.iio.accel.x.opt_scale -1
                        set_property ro.iio.accel.z.opt_scale -1
+                       ;;
+               *i7-WN*)
+                       set_property ro.iio.accel.quirks no-trig
                        ;&
-               *i7Stylus*|*M80TA*)
+               *i7Stylus*)
                        set_property ro.iio.accel.x.opt_scale -1
                        ;;
                *LenovoMIIX320*|*ONDATablet*)
@@ -321,13 +327,16 @@ function init_hal_sensors()
                        set_property ro.iio.accel.x.opt_scale -1
                        set_property ro.iio.accel.y.opt_scale -1
                        ;;
+               *SP111-33*)
+                       set_property ro.iio.accel.quirks no-trig
+                       ;&
                *ST70416-6*)
                        set_property ro.iio.accel.order 102
                        ;;
                *e-tabPro*|*pnEZpad*)
                        set_property ro.iio.accel.quirks no-trig
                        ;&
-               *T*0*TA*)
+               *T*0*TA*|*M80TA*)
                        set_property ro.iio.accel.y.opt_scale -1
                        ;;
                *)
@@ -533,8 +542,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