OSDN Git Service
(root)
/
android-x86
/
device-generic-common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
b689341
..
673f4e1
100644
(file)
--- a/
init.sh
+++ b/
init.sh
@@
-185,8
+185,9
@@
function init_hal_gralloc()
set_property debug.drm.mode.force ${video:-1280x800}
fi
;;
set_property debug.drm.mode.force ${video:-1280x800}
fi
;;
- 0*i
nteldrmfb|0*radeondrmfb|0*nouveaufb
|0*svgadrmfb|0*amdgpudrmfb)
+ 0*i
915drmfb|0*inteldrmfb|0*radeondrmfb|0*nouveau*
|0*svgadrmfb|0*amdgpudrmfb)
if [ "$HWACCEL" != "0" ]; then
if [ "$HWACCEL" != "0" ]; then
+ set_property ro.hardware.hwcomposer ${HWC:-}
set_property ro.hardware.gralloc ${GRALLOC:-drm}
set_drm_mode
fi
set_property ro.hardware.gralloc ${GRALLOC:-drm}
set_drm_mode
fi
@@
-198,6
+199,7
@@
function init_hal_gralloc()
;;
esac
;;
esac
+ [ -z "$(getprop ro.hardware.gralloc)" ] && set_property ro.hardware.egl swiftshader
[ -n "$DEBUG" ] && set_property debug.egl.trace error
}
[ -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
function init_hal_vulkan()
{
case "$(cat /proc/fb | head -1)" in
- 0*inteldrmfb)
+ 0*i
915drmfb|0*i
nteldrmfb)
set_property ro.hardware.vulkan android-x86
;;
0*amdgpudrmfb)
set_property ro.hardware.vulkan android-x86
;;
0*amdgpudrmfb)
@@
-540,8
+542,13
@@
for c in `cat /proc/cmdline`; do
case $c in
DEBUG=*)
[ -n "$DEBUG" ] && set_property debug.logcat 1
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
;;
esac
+ [ "$SETUPWIZARD" = "0" ] && set_property ro.setupwizard.mode DISABLED
fi
;;
esac
fi
;;
esac