libdrm: update to 2.4.111.

libdrm 2.4.111, just a few things built up, and drop libkms.

Alex Deucher (3):
      test/amdgpu: only disable deadlock tests on asics without GPU reset
      amdgpu: add marketing names from 21.50
      amdgpu: add marketing names from 22.10

Andrey Grodzovsky (1):
      tests/amdgpu/hotunplu: Enable hotunplug tests.

Daniel Stone (2):
      drm/atomic: Stable sort for atomic request de-duplication
      libkms: Remove libkms completely

Dave Airlie (1):
      build: bump version to 2.4.111

Dylan Baker (9):
      meson: use dictionary kwargs
      meson: add override_dependency when possible
      meson: switch the meson builtin for symbol visiblity
      meson: switch to cc.get_supported_arguments
      meson: use more standard formatting for better readability
      meson: use cc.check_header instead of open coding
      meson: use cc.has_function_attribute instead of open coding
      meson: use the modern interface for pkg.generate
      meson: use summary() instead of message

Eleni Maria Stea (3):
      xf86drm.c: fix C99 warning
      modeprint, modetest, proptest: cast __u64 to uint64_t
      tests/modeprint: fix argument type

Eric Engestrom (1):
      use standard `__typeof__()` instead of GNU extension `typeof()`

Flora Cui (2):
      tests/amdgpu: add draw test for gfx10
      tests/amdgpu: add dispatch test for gfx10

Guchun Chen (2):
      tests/amdgpu: Add VCN test support for Biege Goby
      tests/amdgpu: use appropriate ring for different asics

Karol Herbst (1):
      nouveau: add ioctl wrapper to check for dead channels

Lu Jiacheng (1):
      tests/amdgpu: Add test suite CP DMA

Matt Turner (2):
      man: Fix some typos
      man: Add formatting to drmModeGetConnector reference

Raviteja Goud Talla (1):
      intel: sync i915_pciids.h with kernel

Samuel Pitoiset (4):
      amdgpu: update_drm.h for new CTX OP to set/get stable pstates
      amdgpu: implement new CTX OP to set/get stable pstates
      tests/amdgpu: add a test for new CTX OP to get/set stable pstates
      build: bump version to 2.4.110

Sathishkumar S (3):
      tests/amdgpu: add jpeg tests support
      tests/amdgpu: enable jpeg test based on ip query
      tests/amdgpu: enable vcn test based on ip query

Simon Ser (1):
      releasing: s/master/main/

Tejas Upadhyay (2):
      intel: Add support for ADL-N
      intel: Add support for RPLP

Thierry Reding (25):
      tegra: Indent according to .editorconfig
      tegra: Remove unused IOCTL implementations
      tegra: Extract common buffer object allocation code
      tegra: Fix mmap() of GEM buffer objects
      tegra: Add flink helpers
      tegra: Add PRIME support helpers
      tegra: Make API more consistent
      tegra: Install tegra-openclose test
      tegra: Update for new UABI
      tegra: Include private.h in list of source files
      tegra: Add channel APIs
      tegra: Add job and push buffer APIs
      tegra: Add syncpoint APIs
      tests: tegra: Add helper library for tests
      tests: tegra: Add gr2d-fill test
      tests: tegra: Add syncpt-wait test
      tests: tegra: Add syncpoint timeout test
      tests: tegra: Add VIC support
      tests: tegra: Add VIC 3.0 support
      tests: tegra: Add VIC 4.0 support
      tests: tegra: Add VIC 4.1 support
      tests: tegra: Add VIC 4.2 support
      tests: tegra: Add VIC clear test
      tests: tegra: Add VIC blit test
      tests: tegra: Add VIC flip test

ravitejax (1):
      intel: Add support for RPLS platform

4 files changed, 8 insertions, 42 deletions

diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile
index 4762aec61de..a8e3f362414 100644
--- a/x11/libdrm/Makefile
+++ b/x11/libdrm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2022/04/10 08:53:17 nia Exp $
+# $NetBSD: Makefile,v 1.102 2022/06/03 08:30:34 wiz Exp $
 
-DISTNAME=		libdrm-2.4.110
+DISTNAME=		libdrm-2.4.111
 CATEGORIES=		x11 graphics
 MASTER_SITES=		https://dri.freedesktop.org/libdrm/
 EXTRACT_SUFX=		.tar.xz
@@ -21,12 +21,10 @@ PKGCONFIG_OVERRIDE+=	etnaviv/libdrm_etnaviv.pc.in
 PKGCONFIG_OVERRIDE+=	exynos/libdrm_exynos.pc.in
 PKGCONFIG_OVERRIDE+=	freedreno/libdrm_freedreno.pc.in
 PKGCONFIG_OVERRIDE+=	intel/libdrm_intel.pc.in
-PKGCONFIG_OVERRIDE+=	libkms/libkms.pc.in
 PKGCONFIG_OVERRIDE+=	nouveau/libdrm_nouveau.pc.in
 PKGCONFIG_OVERRIDE+=	omap/libdrm_omap.pc.in
 PKGCONFIG_OVERRIDE+=	radeon/libdrm_radeon.pc.in
 PKGCONFIG_OVERRIDE+=	tegra/libdrm_tegra.pc.in
-PKGCONFIG_OVERRIDE+=	vc4/libdrm_vc4.pc.in
 PKGCONFIG_OVERRIDE+=	libdrm.pc.in
 
 .include "../../mk/bsd.prefs.mk"
@@ -44,16 +42,7 @@ ATOMIC_OPS_CHECK=	1
 .  include "../../devel/libatomic_ops/buildlink3.mk"
 .endif
 
-PLIST_VARS+=	intel arm kms
-
-.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD"
-MESON_ARGS+=	-Dlibkms=true
-PLIST.kms=	yes
-.else
-MESON_ARGS+=	-Dlibkms=false
-.endif
-
-PLIST_VARS+=	intel arm kms
+PLIST_VARS+=	intel arm
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 MESON_ARGS+=	-Dintel=true
 MESON_ARGS+=	-Dvmwgfx=true
diff --git a/x11/libdrm/PLIST b/x11/libdrm/PLIST
index 50ea27a6995..004e0295296 100644
--- a/x11/libdrm/PLIST
+++ b/x11/libdrm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2022/03/13 15:20:01 tnn Exp $
+@comment $NetBSD: PLIST,v 1.24 2022/06/03 08:30:34 wiz Exp $
 ${PLIST.arm}include/exynos/exynos_drm.h
 ${PLIST.arm}include/exynos/exynos_fimg2d.h
 ${PLIST.arm}include/freedreno/freedreno_drmif.h
@@ -49,7 +49,6 @@ ${PLIST.arm}include/libdrm/vc4_qpu_defines.h
 include/libdrm/via_drm.h
 include/libdrm/virtgpu_drm.h
 ${PLIST.intel}include/libdrm/vmwgfx_drm.h
-${PLIST.kms}include/libkms/libkms.h
 include/libsync.h
 ${PLIST.arm}include/omap/omap_drm.h
 include/xf86drm.h
@@ -84,9 +83,6 @@ lib/libdrm_radeon.so.1.0.1
 ${PLIST.arm}lib/libdrm_tegra.so
 ${PLIST.arm}lib/libdrm_tegra.so.0
 ${PLIST.arm}lib/libdrm_tegra.so.0.0.0
-${PLIST.kms}lib/libkms.so
-${PLIST.kms}lib/libkms.so.1
-${PLIST.kms}lib/libkms.so.1.0.0
 lib/pkgconfig/libdrm.pc
 lib/pkgconfig/libdrm_amdgpu.pc
 ${PLIST.arm}lib/pkgconfig/libdrm_etnaviv.pc
@@ -98,5 +94,4 @@ ${PLIST.arm}lib/pkgconfig/libdrm_omap.pc
 lib/pkgconfig/libdrm_radeon.pc
 ${PLIST.arm}lib/pkgconfig/libdrm_tegra.pc
 ${PLIST.arm}lib/pkgconfig/libdrm_vc4.pc
-${PLIST.kms}lib/pkgconfig/libkms.pc
 share/libdrm/amdgpu.ids
diff --git a/x11/libdrm/distinfo b/x11/libdrm/distinfo
index 954864f1966..3b0ec9b4cab 100644
--- a/x11/libdrm/distinfo
+++ b/x11/libdrm/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.100 2022/03/13 15:20:01 tnn Exp $
+$NetBSD: distinfo,v 1.101 2022/06/03 08:30:34 wiz Exp $
 
-BLAKE2s (libdrm-2.4.110.tar.xz) = 3f45410c126cfb5ad5d8166270faa108751c1476c5f3926cc9b471b341147d0b
-SHA512 (libdrm-2.4.110.tar.xz) = 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3
-Size (libdrm-2.4.110.tar.xz) = 436372 bytes
+BLAKE2s (libdrm-2.4.111.tar.xz) = 59cab153dd99160dc5e0208bcaf7b2230737cd3ffcd61321b0712b2de36c1b06
+SHA512 (libdrm-2.4.111.tar.xz) = 17e92e9e4ded8031ac222764bed7e9ff430a1a377f5e435f6b62b4a7f45cb4c4b769b3b79fbcba11512c1ac973abf8cdcca8e0b9659ae095e915d3d5efcf5516
+Size (libdrm-2.4.111.tar.xz) = 447388 bytes
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
 SHA1 (patch-amdgpu_amdgpu__cs.c) = 125eca62cd3e00a6e039066152780174dcde0705
 SHA1 (patch-etnaviv_etnaviv__device.c) = 236b2df05a918c35c4decfee416ff5bfe9c073d4
 SHA1 (patch-exynos_exynos__drm.c) = 3fa4c8a592a5f4e0c4001eb6fa1bc7811e398605
 SHA1 (patch-exynos_exynos__fimg2d.c) = 298438b128bdb4ff57a8c0d7d6a081485e64e49a
 SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
-SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d
 SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3
 SHA1 (patch-meson.build) = b9ebb763a807da931f83f4d5c02925ab5498ef69
 SHA1 (patch-omap_omap__drm.c) = a23eefa9a57315d3ae77e528fd29de70ff9b2648
diff --git a/x11/libdrm/patches/patch-libkms_vmwgfx.c b/x11/libdrm/patches/patch-libkms_vmwgfx.c
deleted file mode 100644
index bedfefa6151..00000000000
--- a/x11/libdrm/patches/patch-libkms_vmwgfx.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-libkms_vmwgfx.c,v 1.3 2015/05/07 06:31:06 wiz Exp $
-
-Provide compatibility errno number for non-Linux.
-
---- libkms/vmwgfx.c.orig	2015-05-06 23:04:31.000000000 +0000
-+++ libkms/vmwgfx.c
-@@ -39,6 +39,10 @@
- #include "libdrm_macros.h"
- #include "vmwgfx_drm.h"
- 
-+#ifndef ERESTART
-+#define ERESTART 85
-+#endif
-+
- struct vmwgfx_bo
- {
- 	struct kms_bo base;