adafruit-mirror/Raspberry-Pi-Installer-Scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #304 from makermelissa/main

Browse source 
Don't comment out kms driver for mipi display
This commit is contained in:
Melissa LeBlanc-Williams 2024-04-16 11:18:04 -07:00 committed by GitHub
commit db8e46f7c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adafruit-pitft.py
View file

@ -145,6 +145,7 @@ config = [
"overlay_src": "overlays/minipitft13-overlay.dts", "overlay_src": "overlays/minipitft13-overlay.dts",
"overlay_dest": "{boot_dir}/overlays/drm-minipitft13.dtbo", "overlay_dest": "{boot_dir}/overlays/drm-minipitft13.dtbo",
"overlay": "dtoverlay=drm-minipitft13,rotate={pitftrot},fps=60", "overlay": "dtoverlay=drm-minipitft13,rotate={pitftrot},fps=60",
"use_kms": True,
"mipi_data": { "mipi_data": {
"command_bin": "adafruit_st7789_drm", "command_bin": "adafruit_st7789_drm",
"gpio": "dc-gpio=25,backlight-gpio=22", "gpio": "dc-gpio=25,backlight-gpio=22",
@ -173,6 +174,7 @@ config = [
"overlay_src": "overlays/st7789v_240x320-overlay.dts", "overlay_src": "overlays/st7789v_240x320-overlay.dts",
"overlay_dest": "{boot_dir}/overlays/drm-st7789v_240x320.dtbo", "overlay_dest": "{boot_dir}/overlays/drm-st7789v_240x320.dtbo",
"overlay": "dtoverlay=drm-st7789v_240x320,rotate={pitftrot},fps=30", "overlay": "dtoverlay=drm-st7789v_240x320,rotate={pitftrot},fps=30",
"use_kms": True,
"mipi_data": { "mipi_data": {
"command_bin": "adafruit_st7789_drm", "command_bin": "adafruit_st7789_drm",
"gpio": "dc-gpio=25,backlight-gpio=22", "gpio": "dc-gpio=25,backlight-gpio=22",
@ -195,6 +197,7 @@ config = [
"overlay_src": "overlays/minipitft114-overlay.dts", "overlay_src": "overlays/minipitft114-overlay.dts",
"overlay_dest": "{boot_dir}/overlays/drm-minipitft114.dtbo", "overlay_dest": "{boot_dir}/overlays/drm-minipitft114.dtbo",
"overlay": "dtoverlay=drm-minipitft114,rotate={pitftrot},fps=60", "overlay": "dtoverlay=drm-minipitft114,rotate={pitftrot},fps=60",
"use_kms": True,
"mipi_data": { "mipi_data": {
"command_bin": "adafruit_st7789_drm", "command_bin": "adafruit_st7789_drm",
"gpio": "dc-gpio=25,backlight-gpio=22", "gpio": "dc-gpio=25,backlight-gpio=22",
@ -229,6 +232,7 @@ config = [
"overlay_src": "overlays/tftbonnet13-overlay.dts", "overlay_src": "overlays/tftbonnet13-overlay.dts",
"overlay_dest": "{boot_dir}/overlays/drm-tftbonnet13.dtbo", "overlay_dest": "{boot_dir}/overlays/drm-tftbonnet13.dtbo",
"overlay": "dtoverlay=drm-tftbonnet13,rotate={pitftrot},fps=60", "overlay": "dtoverlay=drm-tftbonnet13,rotate={pitftrot},fps=60",
"use_kms": True,
"mipi_data": { "mipi_data": {
"command_bin": "adafruit_st7789_drm", "command_bin": "adafruit_st7789_drm",
"gpio": "dc-gpio=25,backlight-gpio=26", "gpio": "dc-gpio=25,backlight-gpio=26",
@ -581,7 +585,7 @@ def install_fbcp():
shell.reconfig(f"{boot_dir}/config.txt", "^.*hdmi_force_hotplug.*$", "hdmi_force_hotplug=1") shell.reconfig(f"{boot_dir}/config.txt", "^.*hdmi_force_hotplug.*$", "hdmi_force_hotplug=1")
shell.reconfig(f"{boot_dir}/config.txt", "^.*hdmi_group.*$", "hdmi_group=2") shell.reconfig(f"{boot_dir}/config.txt", "^.*hdmi_group.*$", "hdmi_group=2")
shell.reconfig(f"{boot_dir}/config.txt", "^.*hdmi_mode.*$", "hdmi_mode=87") shell.reconfig(f"{boot_dir}/config.txt", "^.*hdmi_mode.*$", "hdmi_mode=87")
if is_bullseye: if is_bullseye and ("use_kms" not in pitft_config or not pitft_config["use_kms"]):
shell.pattern_replace(f"{boot_dir}/config.txt", "^[^#]*dtoverlay=vc4-kms-v3d.*$", "#dtoverlay=vc4-kms-v3d") shell.pattern_replace(f"{boot_dir}/config.txt", "^[^#]*dtoverlay=vc4-kms-v3d.*$", "#dtoverlay=vc4-kms-v3d")
shell.pattern_replace(f"{boot_dir}/config.txt", "^[^#]*dtoverlay=vc4-fkms-v3d.*$", "#dtoverlay=vc4-fkms-v3d") shell.pattern_replace(f"{boot_dir}/config.txt", "^[^#]*dtoverlay=vc4-fkms-v3d.*$", "#dtoverlay=vc4-fkms-v3d")