eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-30 06:49:43 +01:00
Code Issues Releases Wiki Activity

starfive visionfive2: drop outdated kernel patches

Browse source
This commit is contained in:
Nick Cao 2023-08-17 15:09:55 +08:00 committed by Jörg Thalheim
parent 430a56dd16
commit d5bd79a48b
2 changed files with 3 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
starfive/visionfive/v2/linux-6.5.nix
View file

@ -9,15 +9,11 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "starfive-tech"; owner = "starfive-tech";
repo = "linux"; repo = "linux";
rev = "64a6c57ec372c44d0f25416c9614657e274fccff"; rev = "67e8df01b875afd312a7d2ab77f56a62f39dd6d9";
hash = "sha256-ZOCCj/VyUZa36+q6sUnE+qA0FcNCFnQjIUils0hBb28="; hash = "sha256-H+INnZTrfeCLmxPYbQEu3658/e5/Wz/Y5Ann2+lU6WQ=";
}; };
inherit modDirVersion; inherit modDirVersion kernelPatches;
kernelPatches = [{
name = "verisilicon";
patch = ./verisilicon.patch;
}] ++ kernelPatches;
structuredExtraConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
PINCTRL_STARFIVE_JH7110_SYS = yes; PINCTRL_STARFIVE_JH7110_SYS = yes;

46
starfive/visionfive/v2/verisilicon.patch
View file

@ -1,46 +0,0 @@
From f6df0d69978ceb373d14c9337c4cda74d604f46d Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 1 Jul 2023 17:19:22 +0800
Subject: [PATCH 1/2] drm/verisilicon: add missing null entry in vs_drm_dt_ids
---
drivers/gpu/drm/verisilicon/vs_drv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/verisilicon/vs_drv.c b/drivers/gpu/drm/verisilicon/vs_drv.c
index b740fe934035..1255a373f7a2 100644
--- a/drivers/gpu/drm/verisilicon/vs_drv.c
+++ b/drivers/gpu/drm/verisilicon/vs_drv.c
@@ -258,6 +258,7 @@ static SIMPLE_DEV_PM_OPS(vs_drm_pm_ops, vs_drm_suspend, vs_drm_resume);
static const struct of_device_id vs_drm_dt_ids[] = {
{ .compatible = "verisilicon,display-subsystem", },
+ {},
};
MODULE_DEVICE_TABLE(of, vs_drm_dt_ids);
--
2.41.0
From f7d2f6e8c6e566cdd441b7bd4710f7628af15dcb Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 1 Jul 2023 17:49:05 +0800
Subject: [PATCH 2/2] drm/verisilicon: import DMA_BUF namespace
---
drivers/gpu/drm/verisilicon/vs_drv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/verisilicon/vs_drv.c b/drivers/gpu/drm/verisilicon/vs_drv.c
index 1255a373f7a2..8627027047aa 100644
--- a/drivers/gpu/drm/verisilicon/vs_drv.c
+++ b/drivers/gpu/drm/verisilicon/vs_drv.c
@@ -299,4 +299,5 @@ module_init(vs_drm_init);
module_exit(vs_drm_fini);
MODULE_DESCRIPTION("VeriSilicon DRM Driver");
+MODULE_IMPORT_NS(DMA_BUF);
MODULE_LICENSE("GPL");
--
2.41.0