Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove override for fkms driver, use kms driver on Pi3 #11

Open
wants to merge 1 commit into
base: scarthgap
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions conf/machine/include/webos-rpi.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ WEBOS_TARGET_MACHINE_IMPL = "hardware"

MACHINE_FEATURES += "armnn auto-acceleration edgetpu gpu-delegate gl-backend"

# Set gpu memory to "128M"
# Wen use default setting (64M), we got the below error
# [EXIT]: EGL Error : Could not create the egl surface: error = 0x3003
GPU_MEM = "128"
# On Raspberry Pi 3B, at least 160MB gpu_mem setting is required for VKB to
# reliably function at 1920x1080. At 1280x720 or lower, setting it as low
# as the minimum, 16, seems to work. Override in your local.conf if you do
# not intend to use 1080 resolution. At 1080, all other video features seem
# to work, except for VKB, with the lower settings.
GPU_MEM ??= "160"

PREFERRED_PROVIDER_aval-impl = "avoutput-adaptation-layer-rpi"
VIRTUAL-RUNTIME_aval-impl = "avoutput-adaptation-layer-rpi"
Expand Down Expand Up @@ -95,6 +97,3 @@ WEBOS_BLUETOOTH_ENABLED_SERVICE_CLASSES = "SPP GATT FTP OPP A2DP"
# Use ext4 as a uSD rootfs type and don't build ext3
SDIMG_ROOTFS_TYPE = "ext4"
IMAGE_FSTYPES:remove = "ext3"

# Use Fake KMS until surface-manager is fixed to support Full KMS, see WRP-5
VC4DTBO = "vc4-fkms-v3d"
1 change: 0 additions & 1 deletion conf/machine/raspberrypi3-64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ KERNEL_BOOTCMD ?= "booti"
UBOOT_MACHINE = "rpi_arm64_config"
SERIAL_CONSOLES ?= "115200;ttyS0"

VC4DTBO ?= "vc4-fkms-v3d"
ARMSTUB ?= "armstub8.bin"

require conf/machine/include/webos-rpi.inc
1 change: 0 additions & 1 deletion conf/machine/raspberrypi3.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ SDIMG_KERNELIMAGE ?= "kernel7.img"
UBOOT_MACHINE = "rpi_3_32b_config"
SERIAL_CONSOLES ?= "115200;ttyS0"

VC4DTBO ?= "vc4-fkms-v3d"
ARMSTUB ?= "armstub7.bin"

require conf/machine/include/webos-rpi.inc