All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Waldemar Brodkorb <wbx@openadk.org>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH] package/trinity: fix compile error with newer kernels
Date: Tue, 15 Aug 2023 17:17:33 +0200	[thread overview]
Message-ID: <20230815151733.GD2603@scaer> (raw)
In-Reply-To: <ZNtOTqtI6t+Uw/lK@waldemar-brodkorb.de>

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 <wbx@openadk.org>

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 <chuhu@redhat.com>
> +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 <chuhu@redhat.com>
> +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> +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 <drm/exynos_drm.h>
> + #endif
> ++#ifdef USE_DRM_I810
> + #include <drm/i810_drm.h>
> ++#endif
> + #include <drm/i915_drm.h>
> ++#ifdef USE_DRM_MGA
> + #include <drm/mga_drm.h>
> ++#endif
> + #include <drm/nouveau_drm.h>
> ++#ifdef USE_DRM_R128
> + #include <drm/r128_drm.h>
> ++#endif
> + #include <drm/radeon_drm.h>
> ++#ifdef USE_DRM_SAVAGE
> + #include <drm/savage_drm.h>
> ++#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 <jirislaby@gmail.com>
> +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 <jslaby@suse.cz>
> +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> +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

      reply	other threads:[~2023-08-15 15:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-15 10:07 [Buildroot] [PATCH] package/trinity: fix compile error with newer kernels Waldemar Brodkorb
2023-08-15 15:17 ` Yann E. MORIN [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230815151733.GD2603@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@buildroot.org \
    --cc=wbx@openadk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.