Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

device-generic-common: Commit

device/generic/common


Commit MetaInfo

Revisionfdd3a12c3d1ddf7bfb9ca6343305ecf6c468cf60 (tree)
Time2020-01-07 18:12:11
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

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

Change Summary

Incremental Difference

--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -71,7 +71,7 @@ SUPERUSER_PACKAGE_PREFIX := com.android.settings.cyanogenmod.superuser
7171 BOARD_WPA_SUPPLICANT_DRIVER ?= NL80211
7272 WPA_SUPPLICANT_VERSION ?= VER_2_1_DEVEL
7373
74-BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi virgl vmwgfx
74+BOARD_GPU_DRIVERS ?= i915 i965 iris nouveau r300g r600g radeonsi virgl vmwgfx
7575 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
7676 TARGET_HARDWARE_3D := true
7777 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
@@ -211,7 +212,7 @@ function init_hal_hwcomposer()
211212 function init_hal_vulkan()
212213 {
213214 case "$(cat /proc/fb | head -1)" in
214- 0*inteldrmfb)
215+ 0*i915drmfb|0*inteldrmfb)
215216 set_property ro.hardware.vulkan android-x86
216217 ;;
217218 0*amdgpudrmfb)
Show on old repository browser