コミット: e2af8123db2041fbf69844e176eec3a41e4c6ef5 - device-generic-common (git)

device/generic/common

コミットメタ情報

• リビジョン: e2af8123db2041fbf69844e176eec3a41e4c6ef5 (tree)
• 日時: 2020-01-08 11:13:33
• 作者: Chih-Wei Huang <cwhuang@linu...>
• コミッター: Chih-Wei Huang

ログメッセージ

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

変更サマリ

• modified: BoardConfig.mk
• modified: init.sh

差分

--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -73,7 +73,7 @@ SUPERUSER_PACKAGE_PREFIX := com.android.settings.cyanogenmod.superuser
 BOARD_WPA_SUPPLICANT_DRIVER ?= NL80211
 WPA_SUPPLICANT_VERSION ?= VER_2_1_DEVEL
 
-BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi virgl vmwgfx
+BOARD_GPU_DRIVERS ?= i915 i965 iris nouveau r300g r600g radeonsi virgl vmwgfx
 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
 TARGET_HARDWARE_3D := true
 endif

--- a/init.sh
+++ b/init.sh
@@ -185,8 +185,9 @@ function init_hal_gralloc()
 				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
@@ -210,7 +211,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)