From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Tue, 30 Apr 2019 07:42:34 +0000 (+0800)
Subject: Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
X-Git-Tag: android-x86-8.1-r2~3
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=71d9297954ccad00e6f45156125af0fd7f96ae4e;hp=-c

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

71d9297954ccad00e6f45156125af0fd7f96ae4e
diff --combined init.sh
index e632ec7,dc6b004..a73721a
--- a/init.sh
+++ b/init.sh
@@@ -38,10 -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()
@@@ -147,19 -150,18 +147,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
 -			set_prop_if_empty sleep.state none
  			;;
  		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
  			;;
@@@ -179,20 -181,6 +179,20 @@@ function init_hal_hwcomposer(
  	return
  }
  
 +function init_hal_vulkan()
 +{
 +	case "$(cat /proc/fb | head -1)" in
 +		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
@@@ -206,7 -194,7 +206,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)
@@@ -288,7 -276,7 +288,7 @@@ function init_hal_sensors(
  		*i7Stylus*|*M80TA*)
  			set_property ro.iio.accel.x.opt_scale -1
  			;;
- 		*ONDATablet*)
+ 		*LenovoMIIX320*|*ONDATablet*)
  			set_property ro.iio.accel.order 102
  			set_property ro.iio.accel.x.opt_scale -1
  			set_property ro.iio.accel.y.opt_scale -1
@@@ -394,7 -382,6 +394,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
@@@ -453,9 -440,6 +453,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
  			;;