You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/05/05 14:01:32 UTC
(nuttx) branch master updated (03446fb4e3 -> 9d6e2b97fb)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 03446fb4e3 riscv/rv-virt: fix kernel build booting issue
new 339da96469 risc-v/virt: update `kfb64` config
new 9d6e2b97fb video/fb: add munmap support
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig | 12 +++++------
drivers/video/fb.c | 25 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 6 deletions(-)
(nuttx) 02/02: video/fb: add munmap support
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 9d6e2b97fbd1747e646bd88a1ea30136698936bf
Author: Yanfeng Liu <yf...@qq.com>
AuthorDate: Sun May 5 08:04:47 2024 +0800
video/fb: add munmap support
This adds support to user-space munmap() requests in kernel build.
Signed-off-by: Yanfeng Liu <yf...@qq.com>
---
drivers/video/fb.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/drivers/video/fb.c b/drivers/video/fb.c
index 456607ac00..a0a1df78fa 100644
--- a/drivers/video/fb.c
+++ b/drivers/video/fb.c
@@ -135,6 +135,12 @@ static int fb_sem_wait(FAR struct fb_chardev_s *fb,
static void fb_sem_post(FAR struct fb_chardev_s *fb, int overlay);
#endif
+#ifdef CONFIG_BUILD_KERNEL
+static int fb_munmap(FAR struct task_group_s *group,
+ FAR struct mm_map_entry_s *entry,
+ FAR void *start, size_t length);
+#endif
+
/****************************************************************************
* Private Data
****************************************************************************/
@@ -1002,6 +1008,22 @@ static int fb_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
return ret;
}
+#ifdef CONFIG_BUILD_KERNEL
+static int fb_munmap(FAR struct task_group_s *group,
+ FAR struct mm_map_entry_s *entry,
+ FAR void *start, size_t length)
+{
+ if (group && entry)
+ {
+ ginfo("%p, len=%zu\n", entry->vaddr, entry->length);
+ vm_unmap_region(entry->vaddr, entry->length);
+ mm_map_remove(get_current_mm(), entry);
+ }
+
+ return OK;
+}
+#endif
+
static int fb_mmap(FAR struct file *filep, FAR struct mm_map_entry_s *map)
{
FAR struct inode *inode;
@@ -1035,6 +1057,9 @@ static int fb_mmap(FAR struct file *filep, FAR struct mm_map_entry_s *map)
#ifdef CONFIG_BUILD_KERNEL
map->vaddr = vm_map_region((uintptr_t)panelinfo.fbmem + map->offset,
panelinfo.fblen);
+ map->length = panelinfo.fblen;
+ map->munmap = fb_munmap;
+ mm_map_add(get_current_mm(), map);
#else
map->vaddr = (FAR char *)panelinfo.fbmem + map->offset;
#endif
(nuttx) 01/02: risc-v/virt: update `kfb64` config
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 339da96469af9da302d8e52e0d740c2db4a1b4fe
Author: Yanfeng Liu <yf...@qq.com>
AuthorDate: Sun May 5 08:00:01 2024 +0800
risc-v/virt: update `kfb64` config
This updates `rv-virt/kfb64` to support new S-mode in patch 12178
Signed-off-by: Yanfeng Liu <yf...@qq.com>
---
boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig
index e664496f2e..5083239b82 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig
@@ -87,9 +87,9 @@ CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_FILE_APPS=y
CONFIG_NSH_READLINE=y
CONFIG_PATH_INITIAL="/system/bin"
-CONFIG_RAM_SIZE=33554432
-CONFIG_RAM_START=0x80000000
-CONFIG_RAM_VSTART=0x80000000
+CONFIG_RAM_SIZE=2097152
+CONFIG_RAM_START=0x80200000
+CONFIG_RAM_VSTART=0x80200000
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RISCV_SEMIHOSTING_HOSTFS=y
CONFIG_RR_INTERVAL=200
@@ -98,9 +98,9 @@ CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
CONFIG_SERIAL_UART_ARCH_MMIO=y
CONFIG_STACK_COLORATION=y
-CONFIG_START_DAY=2
-CONFIG_START_MONTH=11
-CONFIG_START_YEAR=2022
+CONFIG_START_DAY=5
+CONFIG_START_MONTH=5
+CONFIG_START_YEAR=2024
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NSH_PROGNAME="init"