Skip to content

Commit 608136e

Browse files
ophubophub
committed
rknpu: switch memory manager from DMA_HEAP to DRM_GEM to restore /dev/dri/card1
1 parent 2561fc1 commit 608136e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎kernel-config/release/rk3588/config-6.1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8646,8 +8646,8 @@ CONFIG_ROCKCHIP_RKNPU_DEBUG_FS=y
86468646
CONFIG_ROCKCHIP_RKNPU_PROC_FS=y
86478647
CONFIG_ROCKCHIP_RKNPU_FENCE=y
86488648
CONFIG_ROCKCHIP_RKNPU_SRAM=y
8649-
# CONFIG_ROCKCHIP_RKNPU_DRM_GEM is not set
8650-
CONFIG_ROCKCHIP_RKNPU_DMA_HEAP=y
8649+
CONFIG_ROCKCHIP_RKNPU_DRM_GEM=y
8650+
# CONFIG_ROCKCHIP_RKNPU_DMA_HEAP is not set
86518651
# end of RKNPU
86528652
# end of Device Drivers
86538653

‎kernel-config/release/rk35xx/config-6.1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8579,8 +8579,8 @@ CONFIG_ROCKCHIP_RKNPU_DEBUG_FS=y
85798579
CONFIG_ROCKCHIP_RKNPU_PROC_FS=y
85808580
CONFIG_ROCKCHIP_RKNPU_FENCE=y
85818581
CONFIG_ROCKCHIP_RKNPU_SRAM=y
8582-
# CONFIG_ROCKCHIP_RKNPU_DRM_GEM is not set
8583-
CONFIG_ROCKCHIP_RKNPU_DMA_HEAP=y
8582+
CONFIG_ROCKCHIP_RKNPU_DRM_GEM=y
8583+
# CONFIG_ROCKCHIP_RKNPU_DMA_HEAP is not set
85848584
# end of RKNPU
85858585
# end of Device Drivers
85868586

0 commit comments

Comments
 (0)