Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

device-generic-common: Commit

device/generic/common


Commit MetaInfo

Revisione2af8123db2041fbf69844e176eec3a41e4c6ef5 (tree)
Time2020-01-08 11:13:33
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

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

Change Summary

Incremental Difference

--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -73,7 +73,7 @@ SUPERUSER_PACKAGE_PREFIX := com.android.settings.cyanogenmod.superuser
7373 BOARD_WPA_SUPPLICANT_DRIVER ?= NL80211
7474 WPA_SUPPLICANT_VERSION ?= VER_2_1_DEVEL
7575
76-BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi virgl vmwgfx
76+BOARD_GPU_DRIVERS ?= i915 i965 iris nouveau r300g r600g radeonsi virgl vmwgfx
7777 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
7878 TARGET_HARDWARE_3D := true
7979 endif
--- a/init.sh
+++ b/init.sh
@@ -185,8 +185,9 @@ function init_hal_gralloc()
185185 set_property debug.drm.mode.force ${video:-1280x800}
186186 fi
187187 ;;
188- 0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
188+ 0*i915drmfb|0*inteldrmfb|0*radeondrmfb|0*nouveau*|0*svgadrmfb|0*amdgpudrmfb)
189189 if [ "$HWACCEL" != "0" ]; then
190+ set_property ro.hardware.hwcomposer ${HWC:-}
190191 set_property ro.hardware.gralloc ${GRALLOC:-drm}
191192 set_drm_mode
192193 fi
@@ -210,7 +211,7 @@ function init_hal_hwcomposer()
210211 function init_hal_vulkan()
211212 {
212213 case "$(cat /proc/fb | head -1)" in
213- 0*inteldrmfb)
214+ 0*i915drmfb|0*inteldrmfb)
214215 set_property ro.hardware.vulkan android-x86
215216 ;;
216217 0*amdgpudrmfb)
Show on old repository browser