From 65f180867652feb528c4b2fb015c0caf24dcceb3 Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Mon, 25 May 2026 14:35:19 -0400
Subject: [PATCH] linux-postmarketos-rockchip: enable CONFIG_DRM_ROCKCHIP

4a1612eb56 introduced a set of changes for this kernel to support the
pine64-pinenote. The commit converts certain built-in drivers into
modules to make them work with the device.

This initially broke `pinebook-pro` due to `CONFIG_GPIO_ROCKCHIP=m`
which was reverted with 51261ea7. Making `CONFIG_DRM_ROCKCHIP` a module
pushes screen init to later in the boot, which is less ideal.

This reverts the change for `CONFIG_DRM_ROCKCHIP` for it to be built-in.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8633>
---
 .../linux-postmarketos-rockchip/APKBUILD      |  4 ++--
 .../config-postmarketos-rockchip.aarch64      | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/device/community/linux-postmarketos-rockchip/APKBUILD b/device/community/linux-postmarketos-rockchip/APKBUILD
index d9edab17e..1c4a0e92a 100644
--- a/device/community/linux-postmarketos-rockchip/APKBUILD
+++ b/device/community/linux-postmarketos-rockchip/APKBUILD
@@ -4,7 +4,7 @@ maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
 pkgname=linux-postmarketos-rockchip
 pkgver=7.0.8
 _kernver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline kernel for rockchip devices"
 arch="aarch64"
 _carch="arm64"
@@ -96,5 +96,5 @@ cd7fbd0834ae8558fc0e9ff75591cb60cb4e1aa6beb65976ea515be1c002d9158c134a4f5b7cff56
 8c85b708342f8f09ca25b2234b22e93b62b144a9ef919fbb21827f52fa47498e778c79db1559524dd7fb360f95b2ce174171443c1859656c281be41d2b6c5a0b  linux-7.0.tar.xz
 fefa9bea73bbc03477447b2c8ec03af7c13ad73e520751f89bbff81a7abc00a19a498f390dab6f2de3e59bb0ca9f4003b5f6c919ba5d48e5f52d5365d97b16b6  rk3566-pinenote-support.patch
 665bdc843912a22bc9f1840bf89195f6cccabd2b8ca3313f3c61b5503c84f98395e3de0d28bc31cbc9f1b4be4a41a483db156fad353506bb5be7abdc22e46501  rk3566-pinenote-ultra-suspend.patch
-a10f63880522548d2fd99adac68e557bf93ec0dd957d142b2ffde5ae2e57c60584763fa2e9f924cb97da4cb5fd9ae209ecb3005a2f2519c4a5591f00ee9943bf  config-postmarketos-rockchip.aarch64
+0d17866138c8ea1273b2ef9830256d0015d94f540d6c6c8c2d8864a90ee16f4b3b9dde4b5772dd1d27775e2d6a55c788be1f3632141059abb5a34f3c30ad13aa  config-postmarketos-rockchip.aarch64
 "
diff --git a/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 b/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64
index a9b10e995..c66d7c2c5 100644
--- a/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64
+++ b/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64
@@ -5010,8 +5010,8 @@ CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_PANIC is not set
 CONFIG_DRM_CLIENT=y
-CONFIG_DRM_CLIENT_LIB=m
-CONFIG_DRM_CLIENT_SELECTION=m
+CONFIG_DRM_CLIENT_LIB=y
+CONFIG_DRM_CLIENT_SELECTION=y
 CONFIG_DRM_CLIENT_SETUP=y
 
 #
@@ -5039,7 +5039,7 @@ CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_EPD_HELPER=m
 CONFIG_DRM_TTM=m
 CONFIG_DRM_TTM_HELPER=m
-CONFIG_DRM_GEM_DMA_HELPER=m
+CONFIG_DRM_GEM_DMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=m
 CONFIG_DRM_SCHED=m
 # CONFIG_DRM_AMDGPU is not set
@@ -5064,7 +5064,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 CONFIG_DRM_CROS_EC_ANX7688=m
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_INNO_HDMI=m
+CONFIG_DRM_INNO_HDMI=y
 # CONFIG_DRM_ITE_IT6263 is not set
 # CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
@@ -5099,23 +5099,23 @@ CONFIG_DRM_PARADE_PS8640=y
 # CONFIG_DRM_WAVESHARE_BRIDGE is not set
 CONFIG_DRM_ANALOGIX_ANX6345=m
 CONFIG_DRM_ANALOGIX_ANX78XX=m
-CONFIG_DRM_ANALOGIX_DP=m
+CONFIG_DRM_ANALOGIX_DP=y
 # CONFIG_DRM_ANALOGIX_ANX7625 is not set
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 # CONFIG_DRM_CDNS_DSI is not set
 # CONFIG_DRM_CDNS_MHDP8546 is not set
-CONFIG_DRM_DW_DP=m
-CONFIG_DRM_DW_HDMI=m
+CONFIG_DRM_DW_DP=y
+CONFIG_DRM_DW_HDMI=y
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_GP_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
-CONFIG_DRM_DW_HDMI_QP=m
+CONFIG_DRM_DW_HDMI_QP=y
 # CONFIG_DRM_DW_HDMI_QP_CEC is not set
-CONFIG_DRM_DW_MIPI_DSI=m
-CONFIG_DRM_DW_MIPI_DSI2=m
+CONFIG_DRM_DW_MIPI_DSI=y
+CONFIG_DRM_DW_MIPI_DSI2=y
 # end of Display Interface Bridges
 
 # CONFIG_DRM_ETNAVIV is not set
@@ -5260,7 +5260,7 @@ CONFIG_DRM_PANFROST=m
 CONFIG_DRM_PL111=m
 # CONFIG_DRM_QXL is not set
 # CONFIG_DRM_RADEON is not set
-CONFIG_DRM_ROCKCHIP=m
+CONFIG_DRM_ROCKCHIP=y
 CONFIG_ROCKCHIP_VOP=y
 CONFIG_ROCKCHIP_VOP2=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
@@ -8483,7 +8483,7 @@ CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
 # CONFIG_SECURITY_SAFESETID is not set
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
 # CONFIG_SECURITY_LANDLOCK is not set