Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

device-generic-common: Commit

device/generic/common


Commit MetaInfo

Revisionbde8070574fd36c6e8cb8920c28070d9c0759681 (tree)
Time2020-11-19 08:32:13
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/init.sh
+++ b/init.sh
@@ -184,15 +184,15 @@ function init_hal_gralloc()
184184 {
185185 [ "$VULKAN" = "1" ] && GRALLOC=gbm
186186
187- case "$(cat /proc/fb | head -1)" in
188- *virtio*drmfb|*DRM*emulated)
187+ case "$(readlink /sys/class/graphics/fb0/device/driver)" in
188+ *virtio_gpu)
189189 HWC=${HWC:-drm}
190190 GRALLOC=${GRALLOC:-gbm}
191191 video=${video:-1280x768}
192192 ;&
193- 0*i915drmfb|0*inteldrmfb|0*radeondrmfb|0*nouveau*|0*svgadrmfb|0*amdgpudrmfb)
193+ *i915|*radeon|*nouveau|*vmwgfx|*amdgpu)
194194 if [ "$HWACCEL" != "0" ]; then
195- set_property ro.hardware.hwcomposer ${HWC:-}
195+ ${HWC:+set_property ro.hardware.hwcomposer $HWC}
196196 set_property ro.hardware.gralloc ${GRALLOC:-drm}
197197 set_drm_mode
198198 fi
@@ -200,7 +200,7 @@ function init_hal_gralloc()
200200 "")
201201 init_uvesafb
202202 ;&
203- 0*)
203+ *)
204204 ;;
205205 esac
206206
@@ -216,11 +216,11 @@ function init_hal_hwcomposer()
216216
217217 function init_hal_vulkan()
218218 {
219- case "$(cat /proc/fb | head -1)" in
220- 0*i915drmfb|0*inteldrmfb)
219+ case "$(readlink /sys/class/graphics/fb0/device/driver)" in
220+ *i915)
221221 set_property ro.hardware.vulkan android-x86
222222 ;;
223- 0*amdgpudrmfb)
223+ *amdgpu)
224224 set_property ro.hardware.vulkan radv
225225 ;;
226226 *)
Show on old repository browser