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

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3f7e7f1..6b90e21 100644 (file)
--- 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

diff --git a/init.sh b/init.sh
index b689341..4dc85d8 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
                        ;;
-               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)