From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE5F4C0015E for ; Tue, 15 Aug 2023 15:17:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8E18E81F4E; Tue, 15 Aug 2023 15:17:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8E18E81F4E X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OY7s8yyHfoKn; Tue, 15 Aug 2023 15:17:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id EEF7E81F91; Tue, 15 Aug 2023 15:17:52 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org EEF7E81F91 Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 676DC1BF475 for ; Tue, 15 Aug 2023 15:17:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4D7B340545 for ; Tue, 15 Aug 2023 15:17:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4D7B340545 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W6rHgVoFztjk for ; Tue, 15 Aug 2023 15:17:37 +0000 (UTC) Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by smtp2.osuosl.org (Postfix) with ESMTPS id 32D5B40017 for ; Tue, 15 Aug 2023 15:17:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 32D5B40017 Received: from ymorin.is-a-geek.org (unknown [IPv6:2a01:cb19:8b44:b00:6587:c204:11b1:7ba6]) (Authenticated sender: yann.morin.1998@free.fr) by smtp3-g21.free.fr (Postfix) with ESMTPSA id 3EFD813F8AF; Tue, 15 Aug 2023 17:17:33 +0200 (CEST) Received: by ymorin.is-a-geek.org (sSMTP sendmail emulation); Tue, 15 Aug 2023 17:17:33 +0200 Date: Tue, 15 Aug 2023 17:17:33 +0200 From: "Yann E. MORIN" To: Waldemar Brodkorb Message-ID: <20230815151733.GD2603@scaer> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.22 (2013-10-16) X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1692112655; bh=CpNkU2EOl/vIyPrBVTv2xHKkn18kdFFD0f4/yQ9JJyo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mzU9PyCMmxify6g+iLHxa78FKaZPWUVqjP9qT607Lyg9uuGHCh1YCOQxryaDEc9Mm OllasVRkUbUkiSN1OIZVTsKfPe9pjab4M/CL8nqUJTIvSwILiUtPaMIBFzXoH6LeOi oI5/AWWWZDBzF7qZlqlvDsoG4pjhcuax/cpVHQJRldhdCpVsBJstQ/y1vD6GXihrxa NDuVSSfdjO0gKxEVY5GQg9PLmVOK3hofFJyreGkrXsfYVfN+3VYGTTnFKNqeLRI2+F C6IqDARJue0jkfdXpLcfpHO0H7ST/tqkvEpc9IpXvrfTr6aETCrfkV80kmfBQslOTT yCTsj7Zd8l3dg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=mzU9PyCM Subject: Re: [Buildroot] [PATCH] package/trinity: fix compile error with newer kernels X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: buildroot@buildroot.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Waldemar, All, On 2023-08-15 12:07 +0200, Waldemar Brodkorb spake thusly: > Add two patches from Upstream git to avoid compilation errors with > Linux kernel 6.4.x. > > Fixes: > - http://autobuild.buildroot.net/results/7f9/7f9626827a315b54c42e49ccb0bf75f8b5ec971d > > Signed-off-by: Waldemar Brodkorb Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...-i810-mga-r128-and-savage-support-44.patch | 113 ++++++++++++++++++ > ...06-kvm-drop-KVM_SET_MEMORY_REGION-42.patch | 30 +++++ > 2 files changed, 143 insertions(+) > create mode 100644 package/trinity/0005-ioctls-drm-check-i810-mga-r128-and-savage-support-44.patch > create mode 100644 package/trinity/0006-kvm-drop-KVM_SET_MEMORY_REGION-42.patch > > diff --git a/package/trinity/0005-ioctls-drm-check-i810-mga-r128-and-savage-support-44.patch b/package/trinity/0005-ioctls-drm-check-i810-mga-r128-and-savage-support-44.patch > new file mode 100644 > index 0000000000..b91fddb20b > --- /dev/null > +++ b/package/trinity/0005-ioctls-drm-check-i810-mga-r128-and-savage-support-44.patch > @@ -0,0 +1,113 @@ > +From 6823bacb3c2564bff5da3175c574fd6a6af4d8b2 Mon Sep 17 00:00:00 2001 > +From: chuhu > +Date: Sat, 1 Jul 2023 01:02:37 +0800 > +Subject: [PATCH] ioctls/drm: check i810,mga,r128 and savage support (#44) > + > +kernel v6.3-rc1 removed some drm drivers, so add the extra check to make > +the compile succeed. > + > +7872bc2cb13e drm: Remove the obsolete driver-savage > +28483b8666bf drm: Remove the obsolete driver-r128 > +96ed7db55bef drm: Remove the obsolete driver-mga > +cab18866fead drm: Remove the obsolete driver-i810 > + > +Signed-off-by: Chunyu Hu > +Signed-off-by: Waldemar Brodkorb > +Upstream: https://github.com/kernelslacker/trinity/commit/6823bacb3c2564bff5da3175c574fd6a6af4d8b2 > +--- > + configure | 4 ++++ > + ioctls/drm.c | 14 ++++++++++++++ > + 2 files changed, 18 insertions(+) > + > +diff --git a/configure b/configure > +index 944c8cf7..bbaf9afc 100755 > +--- a/configure > ++++ b/configure > +@@ -320,6 +320,10 @@ check_header linux/irda.h USE_IRDA > + check_header linux/rds.h USE_RDS > + check_header linux/vfio.h USE_VFIO > + check_header drm/drm.h USE_DRM > ++check_header drm/i810_drm.h USE_DRM_I810 > ++check_header drm/mga_drm.h USE_DRM_MGA > ++check_header drm/r128_drm.h USE_DRM_R128 > ++check_header drm/savage_drm.h USE_DRM_SAVAGE > + check_header drm/exynos_drm.h USE_DRM_EXYNOS > + check_header sound/compress_offload.h USE_SNDDRV_COMPRESS_OFFLOAD > + check_header linux/kvm.h USE_KVM > +diff --git a/ioctls/drm.c b/ioctls/drm.c > +index 81ed3682..a07a8436 100644 > +--- a/ioctls/drm.c > ++++ b/ioctls/drm.c > +@@ -8,13 +8,21 @@ > + #ifdef USE_DRM_EXYNOS > + #include > + #endif > ++#ifdef USE_DRM_I810 > + #include > ++#endif > + #include > ++#ifdef USE_DRM_MGA > + #include > ++#endif > + #include > ++#ifdef USE_DRM_R128 > + #include > ++#endif > + #include > ++#ifdef USE_DRM_SAVAGE > + #include > ++#endif > + > + #include "ioctls.h" > + #include "utils.h" > +@@ -293,6 +301,7 @@ static const struct ioctl drm_ioctls[] = { > + #endif > + #endif > + > ++#ifdef USE_DRM_I810 > + /* i810_drm.h */ > + IOCTL(DRM_IOCTL_I810_INIT), > + IOCTL(DRM_IOCTL_I810_VERTEX), > +@@ -309,6 +318,7 @@ static const struct ioctl drm_ioctls[] = { > + IOCTL(DRM_IOCTL_I810_MC), > + IOCTL(DRM_IOCTL_I810_RSTATUS), > + IOCTL(DRM_IOCTL_I810_FLIP), > ++#endif > + > + /* i915_drm.h */ > + IOCTL(DRM_IOCTL_I915_INIT), > +@@ -378,6 +388,7 @@ static const struct ioctl drm_ioctls[] = { > + IOCTL(DRM_IOCTL_I915_REG_READ), > + #endif > + > ++#ifdef USE_DRM_MGA > + /* mga_drm.h */ > + IOCTL(DRM_IOCTL_MGA_INIT), > + IOCTL(DRM_IOCTL_MGA_FLUSH), > +@@ -401,6 +412,7 @@ static const struct ioctl drm_ioctls[] = { > + IOCTL(DRM_IOCTL_NOUVEAU_GROBJ_ALLOC), > + IOCTL(DRM_IOCTL_NOUVEAU_NOTIFIEROBJ_ALLOC), > + IOCTL(DRM_IOCTL_NOUVEAU_GPUOBJ_FREE), > ++#endif > + #ifdef DRM_IOCTL_NOUVEAU_GEM_NEW > + IOCTL(DRM_IOCTL_NOUVEAU_GEM_NEW), > + #endif > +@@ -417,6 +429,7 @@ static const struct ioctl drm_ioctls[] = { > + IOCTL(DRM_IOCTL_NOUVEAU_GEM_INFO), > + #endif > + > ++#ifdef USE_DRM_R128 > + /* r128_drm.h */ > + IOCTL(DRM_IOCTL_R128_INIT), > + IOCTL(DRM_IOCTL_R128_CCE_START), > +@@ -435,6 +448,7 @@ static const struct ioctl drm_ioctls[] = { > + IOCTL(DRM_IOCTL_R128_FULLSCREEN), > + IOCTL(DRM_IOCTL_R128_GETPARAM), > + IOCTL(DRM_IOCTL_R128_FLIP), > ++#endif > + > + /* radeon_drm.h */ > + IOCTL(DRM_IOCTL_RADEON_CP_INIT), > +-- > +2.39.2 > + > diff --git a/package/trinity/0006-kvm-drop-KVM_SET_MEMORY_REGION-42.patch b/package/trinity/0006-kvm-drop-KVM_SET_MEMORY_REGION-42.patch > new file mode 100644 > index 0000000000..4277983694 > --- /dev/null > +++ b/package/trinity/0006-kvm-drop-KVM_SET_MEMORY_REGION-42.patch > @@ -0,0 +1,30 @@ > +From ca07c86b2aeeb91213922eaf481c9e224679a7fd Mon Sep 17 00:00:00 2001 > +From: Jiri Slaby > +Date: Fri, 17 Mar 2023 20:28:24 +0100 > +Subject: [PATCH] kvm: drop KVM_SET_MEMORY_REGION (#42) > + > +It was dropped in upstream in commit 61e15f871241 (KVM: Delete all > +references to removed KVM_SET_MEMORY_REGION ioctl). > + > +Co-authored-by: Jiri Slaby > +Signed-off-by: Waldemar Brodkorb > +Upstream: https://github.com/kernelslacker/trinity/commit/ca07c86b2aeeb91213922eaf481c9e224679a7fd > +--- > + ioctls/kvm.c | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/ioctls/kvm.c b/ioctls/kvm.c > +index 14c55ef1..30aeed7a 100644 > +--- a/ioctls/kvm.c > ++++ b/ioctls/kvm.c > +@@ -8,7 +8,6 @@ > + #include "utils.h" > + > + static const struct ioctl kvm_ioctls[] = { > +- IOCTL(KVM_SET_MEMORY_REGION), > + IOCTL(KVM_CREATE_VCPU), > + IOCTL(KVM_GET_DIRTY_LOG), > + IOCTL(KVM_SET_NR_MMU_PAGES), > +-- > +2.39.2 > + > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot