From 8b5054fc3e4842a86a80ddcf71cab4fc91163add Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 9 Dec 2019 02:14:31 +0000
Subject: [PATCH 01/20] linux (Generic): update to linux-5.5-rc1

---
 packages/linux/package.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index d3a50ae97f..60c309cbb9 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -29,9 +29,9 @@ case "$LINUX" in
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;
   *)
-    PKG_VERSION="5.4.16"
-    PKG_SHA256="911541df2974782062f551ba0a818d7822ec69db4c41e590bcc7422398bada7a"
-    PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz"
+    PKG_VERSION="5.5-rc1"
+    PKG_SHA256="b739f74a099f96128eecad8bad6346f0f41df7e526846e21b912c985c0175a34"
+    PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz"
     PKG_PATCH_DIRS="default"
     ;;
 esac

From 56020f5da1649169a26e6356280d5a63e96c25a1 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 9 Dec 2019 02:18:49 +0000
Subject: [PATCH 02/20] linux (Generic): drop upstreamed patches

---
 .../linux-063-imon_ultrabay-id_0x98.patch     | 153 ------------------
 1 file changed, 153 deletions(-)
 delete mode 100644 packages/linux/patches/default/linux-063-imon_ultrabay-id_0x98.patch

diff --git a/packages/linux/patches/default/linux-063-imon_ultrabay-id_0x98.patch b/packages/linux/patches/default/linux-063-imon_ultrabay-id_0x98.patch
deleted file mode 100644
index 2612d876fd..0000000000
--- a/packages/linux/patches/default/linux-063-imon_ultrabay-id_0x98.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From cf330691668a3bee37b8ac8212709b3ccdd87997 Mon Sep 17 00:00:00 2001
-From: Flavius Georgescu <pretoriano.mp@gmail.com>
-Date: Fri, 20 Sep 2019 13:11:39 -0300
-Subject: media: rc: Add support for another iMON 0xffdc device
-
-The device it's an iMON UltraBay (0x98 in config byte) with LCD,
-IR and dual-knobs front panel.
-
-To work properly the device also require its own key table,
-and repeat suppression for all buttons.
-
-Signed-off-by: Flavius Georgescu <pretoriano.mp@gmail.com>
-Co-developed-by: Chris Vandomelen <chris@sightworks.com>
-Signed-off-by: Chris Vandomelen <chris@sightworks.com>
-Signed-off-by: Sean Young <sean@mess.org>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
----
- drivers/media/rc/imon.c | 61 +++++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 51 insertions(+), 10 deletions(-)
-
-(limited to 'drivers/media/rc/imon.c')
-
-diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
-index 37a850421fbb..b8d96c50a804 100644
---- a/drivers/media/rc/imon.c
-+++ b/drivers/media/rc/imon.c
-@@ -83,6 +83,7 @@ struct imon_usb_dev_descr {
- 	__u16 flags;
- #define IMON_NO_FLAGS 0
- #define IMON_NEED_20MS_PKT_DELAY 1
-+#define IMON_SUPPRESS_REPEATED_KEYS 2
- 	struct imon_panel_key_table key_table[];
- };
- 
-@@ -149,8 +150,9 @@ struct imon_context {
- 	struct timer_list ttimer;	/* touch screen timer */
- 	int touch_x;			/* x coordinate on touchscreen */
- 	int touch_y;			/* y coordinate on touchscreen */
--	struct imon_usb_dev_descr *dev_descr; /* device description with key
--						 table for front panels */
-+	const struct imon_usb_dev_descr *dev_descr;
-+					/* device description with key */
-+					/* table for front panels */
- };
- 
- #define TOUCH_TIMEOUT	(HZ/30)
-@@ -315,6 +317,32 @@ static const struct imon_usb_dev_descr imon_DH102 = {
- 	}
- };
- 
-+/* imon ultrabay front panel key table */
-+static const struct imon_usb_dev_descr ultrabay_table = {
-+	.flags = IMON_SUPPRESS_REPEATED_KEYS,
-+	.key_table = {
-+		{ 0x0000000f0000ffeell, KEY_MEDIA },      /* Go */
-+		{ 0x000000000100ffeell, KEY_UP },
-+		{ 0x000000000001ffeell, KEY_DOWN },
-+		{ 0x000000160000ffeell, KEY_ENTER },
-+		{ 0x0000001f0000ffeell, KEY_AUDIO },      /* Music */
-+		{ 0x000000200000ffeell, KEY_VIDEO },      /* Movie */
-+		{ 0x000000210000ffeell, KEY_CAMERA },     /* Photo */
-+		{ 0x000000270000ffeell, KEY_DVD },        /* DVD */
-+		{ 0x000000230000ffeell, KEY_TV },         /* TV */
-+		{ 0x000000050000ffeell, KEY_PREVIOUS },   /* Previous */
-+		{ 0x000000070000ffeell, KEY_REWIND },
-+		{ 0x000000040000ffeell, KEY_STOP },
-+		{ 0x000000020000ffeell, KEY_PLAYPAUSE },
-+		{ 0x000000080000ffeell, KEY_FASTFORWARD },
-+		{ 0x000000060000ffeell, KEY_NEXT },       /* Next */
-+		{ 0x000100000000ffeell, KEY_VOLUMEUP },
-+		{ 0x010000000000ffeell, KEY_VOLUMEDOWN },
-+		{ 0x000000010000ffeell, KEY_MUTE },
-+		{ 0, KEY_RESERVED },
-+	}
-+};
-+
- /*
-  * USB Device ID for iMON USB Control Boards
-  *
-@@ -1264,9 +1292,11 @@ static u32 imon_mce_key_lookup(struct imon_context *ictx, u32 scancode)
- 
- static u32 imon_panel_key_lookup(struct imon_context *ictx, u64 code)
- {
--	int i;
-+	const struct imon_panel_key_table *key_table;
- 	u32 keycode = KEY_RESERVED;
--	struct imon_panel_key_table *key_table = ictx->dev_descr->key_table;
-+	int i;
-+
-+	key_table = ictx->dev_descr->key_table;
- 
- 	for (i = 0; key_table[i].hw_code != 0; i++) {
- 		if (key_table[i].hw_code == (code | 0xffee)) {
-@@ -1550,7 +1580,6 @@ static void imon_incoming_packet(struct imon_context *ictx,
- 	u32 kc;
- 	u64 scancode;
- 	int press_type = 0;
--	long msec;
- 	ktime_t t;
- 	static ktime_t prev_time;
- 	u8 ktype;
-@@ -1653,14 +1682,16 @@ static void imon_incoming_packet(struct imon_context *ictx,
- 	spin_lock_irqsave(&ictx->kc_lock, flags);
- 
- 	t = ktime_get();
--	/* KEY_MUTE repeats from knob need to be suppressed */
--	if (ictx->kc == KEY_MUTE && ictx->kc == ictx->last_keycode) {
--		msec = ktime_ms_delta(t, prev_time);
--		if (msec < ictx->idev->rep[REP_DELAY]) {
-+	/* KEY repeats from knob and panel that need to be suppressed */
-+	if (ictx->kc == KEY_MUTE ||
-+	    ictx->dev_descr->flags & IMON_SUPPRESS_REPEATED_KEYS) {
-+		if (ictx->kc == ictx->last_keycode &&
-+		    ktime_ms_delta(t, prev_time) < ictx->idev->rep[REP_DELAY]) {
- 			spin_unlock_irqrestore(&ictx->kc_lock, flags);
- 			return;
- 		}
- 	}
-+
- 	prev_time = t;
- 	kc = ictx->kc;
- 
-@@ -1848,6 +1879,14 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
- 		dev_info(ictx->dev, "0xffdc iMON Inside, iMON IR");
- 		ictx->display_supported = false;
- 		break;
-+	/* Soundgraph iMON UltraBay */
-+	case 0x98:
-+		dev_info(ictx->dev, "0xffdc iMON UltraBay, LCD + IR");
-+		detected_display_type = IMON_DISPLAY_TYPE_LCD;
-+		allowed_protos = RC_PROTO_BIT_IMON | RC_PROTO_BIT_RC6_MCE;
-+		ictx->dev_descr = &ultrabay_table;
-+		break;
-+
- 	default:
- 		dev_info(ictx->dev, "Unknown 0xffdc device, defaulting to VFD and iMON IR");
- 		detected_display_type = IMON_DISPLAY_TYPE_VFD;
-@@ -1979,10 +2018,12 @@ out:
- 
- static struct input_dev *imon_init_idev(struct imon_context *ictx)
- {
--	struct imon_panel_key_table *key_table = ictx->dev_descr->key_table;
-+	const struct imon_panel_key_table *key_table;
- 	struct input_dev *idev;
- 	int ret, i;
- 
-+	key_table = ictx->dev_descr->key_table;
-+
- 	idev = input_allocate_device();
- 	if (!idev)
- 		goto out;
--- 
-cgit 1.2-0.3.lf.el7

From 31925b85a471e8713b69690bc03b1358010ff4a0 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 9 Dec 2019 02:23:32 +0000
Subject: [PATCH 03/20] linux (Generic): drop obsolete patch after major
 upstream refactor

See: https://github.com/torvalds/linux/commit/3e7abf8141935ded77abeb622480bf4a14241ece
---
 ...-with-clockfreq-changes-on-Bay-Trail.patch | 89 -------------------
 1 file changed, 89 deletions(-)
 delete mode 100644 packages/linux/patches/default/linux-999.20-i915-pm-Be-less-agressive-with-clockfreq-changes-on-Bay-Trail.patch

diff --git a/packages/linux/patches/default/linux-999.20-i915-pm-Be-less-agressive-with-clockfreq-changes-on-Bay-Trail.patch b/packages/linux/patches/default/linux-999.20-i915-pm-Be-less-agressive-with-clockfreq-changes-on-Bay-Trail.patch
deleted file mode 100644
index 0a68a040d8..0000000000
--- a/packages/linux/patches/default/linux-999.20-i915-pm-Be-less-agressive-with-clockfreq-changes-on-Bay-Trail.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 28ad70a06fb84fe63cd036970db2561b2fd1562b Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Sun, 5 Nov 2017 16:51:23 +0100
-Subject: [PATCH v3 1/2] i915: pm: Be less agressive with clockfreq changes on
- Bay Trail
-
-Bay Trail devices are known to hang when changing the frequency often,
-this is discussed in great length in:
-https://bugzilla.kernel.org/show_bug.cgi?id=109051
-
-Commit 6067a27d1f01 ("drm/i915: Avoid tweaking evaluation thresholds
-on Baytrail v3") is an attempt to workaround this. Several users in
-bko109051 report that an earlier version of this patch, v1:
-https://bugzilla.kernel.org/attachment.cgi?id=251471
-
-Works better for them and they still see hangs with the merged v3.
-
-Comparing the 2 versions shows that they are indeed not equivalent,
-v1 not only skips writing the GEN6_RP* registers from valleyview_set_rps,
-as v3 does. It also contained these modifications to i915_irq.c:
-
-     if (pm_iir & GEN6_PM_RP_DOWN_EI_EXPIRED) {
-         if (!vlv_c0_above(dev_priv,
-                   &dev_priv->rps.down_ei, &now,
--                  dev_priv->rps.down_threshold))
-+                  VLV_RP_DOWN_EI_THRESHOLD))
-             events |= GEN6_PM_RP_DOWN_THRESHOLD;
-         dev_priv->rps.down_ei = now;
-     }
-
-     if (pm_iir & GEN6_PM_RP_UP_EI_EXPIRED) {
-         if (vlv_c0_above(dev_priv,
-                  &dev_priv->rps.up_ei, &now,
--                 dev_priv->rps.up_threshold))
-+                 VLV_RP_UP_EI_THRESHOLD))
-             events |= GEN6_PM_RP_UP_THRESHOLD;
-         dev_priv->rps.up_ei = now;
-     }
-
-Which use less aggressive up/down thresholds, which results in less
-GEN6_PM_RP_*_THRESHOLD events and thus in less calls to intel_set_rps() ->
-valleyview_set_rps() -> vlv_punit_write(PUNIT_REG_GPU_FREQ_REQ).
-With the last call being the likely cause of the hang.
-
-This commit hardcodes the threshold_up and _down values for Bay Trail to
-less aggressive values, reducing the amount of clock frequency changes,
-thus avoiding the hangs some people are still seeing with the merged fix.
-
-Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=109051
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/gpu/drm/i915/i915_reg.h | 3 +++
- drivers/gpu/drm/i915/intel_pm.c | 5 ++++-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index 68a58cce6ab1..2561af075ebb 100644
---- a/drivers/gpu/drm/i915/i915_reg.h
-+++ b/drivers/gpu/drm/i915/i915_reg.h
-@@ -1355,6 +1355,9 @@ enum i915_power_well_id {
- #define 	VLV_BIAS_CPU_125_SOC_875 (6 << 2)
- #define 	CHV_BIAS_CPU_50_SOC_50 (3 << 2)
- 
-+#define VLV_RP_UP_EI_THRESHOLD			90
-+#define VLV_RP_DOWN_EI_THRESHOLD		70
-+
- /* vlv2 north clock has */
- #define CCK_FUSE_REG				0x8
- #define  CCK_FUSE_HPLL_FREQ_MASK		0x3
-diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
-index 01966b89be14..177b6caa0a38 100644
---- a/drivers/gpu/drm/i915/intel_pm.c
-+++ b/drivers/gpu/drm/i915/intel_pm.c
-@@ -6096,8 +6096,11 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val)
- 	/* When byt can survive without system hang with dynamic
- 	 * sw freq adjustments, this restriction can be lifted.
- 	 */
--	if (IS_VALLEYVIEW(dev_priv))
-+	if (IS_VALLEYVIEW(dev_priv)) {
-+		threshold_up = VLV_RP_UP_EI_THRESHOLD;
-+		threshold_down = VLV_RP_DOWN_EI_THRESHOLD;
- 		goto skip_hw_write;
-+	}
- 
- 	I915_WRITE(GEN6_RP_UP_EI,
- 		   GT_INTERVAL_FROM_US(dev_priv, ei_up));
--- 
-2.14.3
-

From c1c53bcd1d8f69634a2249fa5da8d9d96c03c5f5 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 9 Dec 2019 03:57:54 +0000
Subject: [PATCH 04/20] linux (Generic): drop obselete patch after upstream
 refactor

See: https://github.com/torvalds/linux/commit/ba1e78a1dc0ca3e92f0be82279e6ba24177af7d6
---
 ...dle-Disable-C6N-and-C6S-on-Bay-Trail.patch | 53 -------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 packages/linux/patches/default/linux-999.21-intel_idle-Disable-C6N-and-C6S-on-Bay-Trail.patch

diff --git a/packages/linux/patches/default/linux-999.21-intel_idle-Disable-C6N-and-C6S-on-Bay-Trail.patch b/packages/linux/patches/default/linux-999.21-intel_idle-Disable-C6N-and-C6S-on-Bay-Trail.patch
deleted file mode 100644
index 8b820cdc82..0000000000
--- a/packages/linux/patches/default/linux-999.21-intel_idle-Disable-C6N-and-C6S-on-Bay-Trail.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 945d0eb39d8920854c72ecb743c07d54b738cf7f Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 9 Nov 2017 14:21:24 +0100
-Subject: [PATCH v3 2/2] intel_idle: Disable C6N and C6S on Bay Trail
-
-It seems that Bay Trail SoCs sometimes have issues waking from C6,
-a lot of users even report Bay Trail devices only being stable
-when passing intel_idle.max_cstate=1 to the kernel.
-
-This commits disables the C6 states while leaving the C7 states
-available so that the cores can still reach deep sleep states.
-
-There are several indicators that this is part of the solution for
-all the users who need to pass intel_idle.max_cstate=1:
-
-1) The "VLP52 EOI Transactions May Not be Sent if Software
-   Enters Core C6 During an Interrupt Service Routine" errata.
-
-2) Several users who need intel_idle.max_cstate=1 indicate in bko109051
-   (which has over 800 comments!) that using a shell script which
-   disables C6N and C6S through sysfs allows them to remove
-   intel_idle.max_cstate=1 and still have a stable system which does
-   use the C7 states for power-saving.
-
-BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=109051
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/idle/intel_idle.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
-index 5dc7ea4b6bc4..fe05984c9e81 100644
---- a/drivers/idle/intel_idle.c
-+++ b/drivers/idle/intel_idle.c
-@@ -221,6 +221,7 @@ static struct cpuidle_state byt_cstates[] = {
- 		.flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED,
- 		.exit_latency = 300,
- 		.target_residency = 275,
-+		.disabled = true,
- 		.enter = &intel_idle,
- 		.enter_s2idle = intel_idle_s2idle, },
- 	{
-@@ -229,6 +230,7 @@ static struct cpuidle_state byt_cstates[] = {
- 		.flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED,
- 		.exit_latency = 500,
- 		.target_residency = 560,
-+		.disabled = true,
- 		.enter = &intel_idle,
- 		.enter_s2idle = intel_idle_s2idle, },
- 	{
--- 
-2.14.3
-

From 385e5b04e2eeb5aea3f3ae8a66a285d6c0b6b1cb Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 9 Dec 2019 02:54:30 +0000
Subject: [PATCH 05/20] linux (Generic): config options for 5.5-rc1

---
 projects/Generic/linux/linux.x86_64.conf | 202 +++++++++++++----------
 1 file changed, 115 insertions(+), 87 deletions(-)

diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index de20869359..14e4418399 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.0 Kernel Configuration
+# Linux/x86_64 5.5.0-rc1 Kernel Configuration
 #
 
 #
@@ -22,7 +22,6 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -135,6 +134,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_CC_HAS_INT128=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -194,7 +194,6 @@ CONFIG_EXPERT=y
 CONFIG_MULTIUSER=y
 # CONFIG_SGETMASK_SYSCALL is not set
 # CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_FHANDLE=y
 CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
@@ -339,7 +338,6 @@ CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
 CONFIG_GART_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
 # CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=512
@@ -365,6 +363,7 @@ CONFIG_PERF_EVENTS_AMD_POWER=y
 CONFIG_X86_16BIT=y
 CONFIG_X86_ESPFIX64=y
 CONFIG_X86_VSYSCALL_EMULATION=y
+CONFIG_X86_IOPL_IOPERM=y
 # CONFIG_I8K is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
@@ -399,7 +398,7 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 # CONFIG_X86_SMAP is not set
-CONFIG_X86_INTEL_UMIP=y
+CONFIG_X86_UMIP=y
 # CONFIG_X86_INTEL_MPX is not set
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
@@ -495,7 +494,6 @@ CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
 CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_NUMA=y
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD is not set
@@ -509,6 +507,7 @@ CONFIG_ACPI_HOTPLUG_IOAPIC=y
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 # CONFIG_ACPI_NFIT is not set
+CONFIG_ACPI_NUMA=y
 # CONFIG_ACPI_HMAT is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
@@ -717,7 +716,6 @@ CONFIG_HAVE_STACK_VALIDATION=y
 CONFIG_HAVE_RELIABLE_STACKTRACE=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
-CONFIG_64BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 # CONFIG_VMAP_STACK is not set
@@ -725,8 +723,6 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_REFCOUNT=y
-# CONFIG_REFCOUNT_FULL is not set
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
@@ -888,6 +884,7 @@ CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_GUP_BENCHMARK is not set
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_MAPPING_DIRTY_HELPERS=y
 # end of Memory Management options
 
 CONFIG_NET=y
@@ -1405,7 +1402,6 @@ CONFIG_PCIEAER=y
 # CONFIG_PCIEAER_INJECT is not set
 # CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
@@ -1429,12 +1425,6 @@ CONFIG_PCI_LABEL=y
 #
 # PCI controller drivers
 #
-
-#
-# Cadence PCIe controllers support
-#
-# end of Cadence PCIe controllers support
-
 # CONFIG_VMD is not set
 
 #
@@ -1443,6 +1433,11 @@ CONFIG_PCI_LABEL=y
 # CONFIG_PCIE_DW_PLAT_HOST is not set
 # CONFIG_PCI_MESON is not set
 # end of DesignWare PCI Core Support
+
+#
+# Cadence PCIe controllers support
+#
+# end of Cadence PCIe controllers support
 # end of PCI controller drivers
 
 #
@@ -1477,6 +1472,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_FIRMWARE_DIR="external-firmware"
 # CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_FW_LOADER_COMPRESS is not set
+CONFIG_FW_CACHE=y
 # end of Firmware loader
 
 CONFIG_WANT_DEV_COREDUMP=y
@@ -1541,6 +1537,7 @@ CONFIG_VIRTIO_BLK=y
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
+# CONFIG_NVME_HWMON is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TCP is not set
 # CONFIG_NVME_TARGET is not set
@@ -1602,41 +1599,9 @@ CONFIG_ALTERA_STAPL=m
 #
 # Intel MIC & related support
 #
-
-#
-# Intel MIC Bus Driver
-#
 # CONFIG_INTEL_MIC_BUS is not set
-
-#
-# SCIF Bus Driver
-#
 # CONFIG_SCIF_BUS is not set
-
-#
-# VOP Bus Driver
-#
 # CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
 # end of Intel MIC & related support
 
 # CONFIG_GENWQE is not set
@@ -1878,10 +1843,6 @@ CONFIG_VIRTIO_NET=y
 # CONFIG_NLMON is not set
 # CONFIG_ARCNET is not set
 
-#
-# CAIF transport drivers
-#
-
 #
 # Distributed Switch Architecture drivers
 #
@@ -1953,7 +1914,6 @@ CONFIG_ULI526X=y
 # CONFIG_NET_VENDOR_EMULEX is not set
 CONFIG_NET_VENDOR_EZCHIP=y
 # CONFIG_NET_VENDOR_GOOGLE is not set
-# CONFIG_NET_VENDOR_HP is not set
 # CONFIG_NET_VENDOR_HUAWEI is not set
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
@@ -2056,7 +2016,6 @@ CONFIG_PHYLIB=y
 CONFIG_AMD_PHY=y
 # CONFIG_AQUANTIA_PHY is not set
 # CONFIG_AX88796B_PHY is not set
-CONFIG_AT803X_PHY=y
 # CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCM87XX_PHY is not set
 CONFIG_BCM_NET_PHYLIB=y
@@ -2068,6 +2027,7 @@ CONFIG_BROADCOM_PHY=y
 # CONFIG_DP83TC811_PHY is not set
 # CONFIG_DP83848_PHY is not set
 # CONFIG_DP83867_PHY is not set
+# CONFIG_DP83869_PHY is not set
 # CONFIG_FIXED_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_INTEL_XWAY_PHY is not set
@@ -2081,6 +2041,7 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_MICROSEMI_PHY is not set
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
+CONFIG_AT803X_PHY=y
 # CONFIG_QSEMI_PHY is not set
 CONFIG_REALTEK_PHY=y
 # CONFIG_RENESAS_PHY is not set
@@ -2816,6 +2777,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_KVM=y
+# CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # end of PTP clock support
 
 CONFIG_PINCTRL=y
@@ -2837,6 +2799,8 @@ CONFIG_PINCTRL_GEMINILAKE=y
 CONFIG_PINCTRL_ICELAKE=y
 CONFIG_PINCTRL_LEWISBURG=y
 CONFIG_PINCTRL_SUNRISEPOINT=y
+CONFIG_PINCTRL_TIGERLAKE=y
+# CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_GPIO_ACPI=y
@@ -2984,6 +2948,7 @@ CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_POWR1220 is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LTC2945 is not set
+# CONFIG_SENSORS_LTC2947_I2C is not set
 # CONFIG_SENSORS_LTC2990 is not set
 # CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
@@ -3055,6 +3020,7 @@ CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_TMP108 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_VIA_CPUTEMP is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
@@ -3089,7 +3055,6 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 # CONFIG_THERMAL_EMULATION is not set
 
 #
@@ -3892,12 +3857,15 @@ CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=y
+CONFIG_DRM_TTM_DMA_PAGE_POOL=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y
 
 #
@@ -3936,6 +3904,7 @@ CONFIG_DRM_AMD_DC_DCN1_0=y
 CONFIG_DRM_AMD_DC_DCN2_0=y
 CONFIG_DRM_AMD_DC_DCN2_1=y
 CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
+# CONFIG_DRM_AMD_DC_HDCP is not set
 # CONFIG_DEBUG_KERNEL_DC is not set
 # end of Display Engine Configuration
 
@@ -3968,7 +3937,11 @@ CONFIG_DRM_I915_USERPTR=y
 # drm/i915 Profile Guided Optimisation
 #
 CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
+CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
 CONFIG_DRM_I915_SPIN_REQUEST=5
+CONFIG_DRM_I915_STOP_TIMEOUT=100
+CONFIG_DRM_I915_TIMESLICE_DURATION=1
 # end of drm/i915 Profile Guided Optimisation
 
 # CONFIG_DRM_VGEM is not set
@@ -4080,7 +4053,7 @@ CONFIG_FB_UDL=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_APPLE is not set
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
+# CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
@@ -4217,7 +4190,6 @@ CONFIG_SND_VIRTUOSO=m
 #
 CONFIG_SND_HDA=m
 CONFIG_SND_HDA_INTEL=m
-# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
@@ -4245,7 +4217,8 @@ CONFIG_SND_HDA_COMPONENT=y
 CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_EXT_CORE=m
 CONFIG_SND_HDA_PREALLOC_SIZE=2048
-CONFIG_SND_INTEL_NHLT=m
+CONFIG_SND_INTEL_NHLT=y
+CONFIG_SND_INTEL_DSP_CONFIG=m
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
@@ -4349,7 +4322,6 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 # CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH is not set
 # CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH is not set
 # CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
@@ -4373,6 +4345,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ADAU1701 is not set
 # CONFIG_SND_SOC_ADAU1761_I2C is not set
 CONFIG_SND_SOC_ADAU7002=m
+# CONFIG_SND_SOC_ADAU7118_HW is not set
+# CONFIG_SND_SOC_ADAU7118_I2C is not set
 # CONFIG_SND_SOC_AK4118 is not set
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4448,6 +4422,8 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_STA350 is not set
 # CONFIG_SND_SOC_STI_SAS is not set
 # CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS2562 is not set
+# CONFIG_SND_SOC_TAS2770 is not set
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
 # CONFIG_SND_SOC_TAS5720 is not set
@@ -5051,6 +5027,7 @@ CONFIG_DW_DMAC_PCI=m
 # CONFIG_DW_EDMA is not set
 # CONFIG_DW_EDMA_PCIE is not set
 CONFIG_HSU_DMA=y
+# CONFIG_SF_PDMA is not set
 
 #
 # DMA Clients
@@ -5147,6 +5124,8 @@ CONFIG_STAGING_MEDIA=y
 # CONFIG_UWB is not set
 # CONFIG_EXFAT_FS is not set
 # CONFIG_QLGE is not set
+# CONFIG_NET_VENDOR_HP is not set
+# CONFIG_WFX is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 # CONFIG_ACER_WMI is not set
 # CONFIG_ACER_WIRELESS is not set
@@ -5217,6 +5196,7 @@ CONFIG_INTEL_ATOMISP2_PM=y
 # CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
 # end of Intel Speed Select Technology interface support
 
+# CONFIG_SYSTEM76_ACPI is not set
 CONFIG_PMC_ATOM=y
 # CONFIG_MFD_CROS_EC is not set
 # CONFIG_CHROME_PLATFORMS is not set
@@ -5632,6 +5612,7 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 # CONFIG_DLM is not set
 # CONFIG_UNICODE is not set
+CONFIG_IO_WQ=y
 # end of File systems
 
 #
@@ -5679,8 +5660,8 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=y
@@ -5714,6 +5695,8 @@ CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_CURVE25519 is not set
+# CONFIG_CRYPTO_CURVE25519_X86 is not set
 
 #
 # Authenticated Encryption with Associated Data
@@ -5759,7 +5742,10 @@ CONFIG_CRYPTO_CRC32C=y
 # CONFIG_CRYPTO_CRC32C_INTEL is not set
 CONFIG_CRYPTO_CRC32=y
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
-# CONFIG_CRYPTO_XXHASH is not set
+CONFIG_CRYPTO_XXHASH=y
+# CONFIG_CRYPTO_BLAKE2B is not set
+# CONFIG_CRYPTO_BLAKE2S is not set
+# CONFIG_CRYPTO_BLAKE2S_X86 is not set
 # CONFIG_CRYPTO_CRCT10DIF is not set
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_POLY1305 is not set
@@ -5775,7 +5761,6 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_SSSE3=y
 CONFIG_CRYPTO_SHA256_SSSE3=y
 CONFIG_CRYPTO_SHA512_SSSE3=y
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SHA3 is not set
@@ -5788,12 +5773,10 @@ CONFIG_CRYPTO_SHA512=y
 #
 # Ciphers
 #
-CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
 CONFIG_CRYPTO_AES_NI_INTEL=y
 # CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_LIB_ARC4=y
 CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set
@@ -5805,7 +5788,6 @@ CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set
-CONFIG_CRYPTO_LIB_DES=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_DES3_EDE_X86_64=y
 # CONFIG_CRYPTO_FCRYPT is not set
@@ -5851,6 +5833,20 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=y
 # CONFIG_CRYPTO_USER_API_RNG is not set
 CONFIG_CRYPTO_USER_API_AEAD=y
 CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=y
+# CONFIG_CRYPTO_LIB_BLAKE2S is not set
+# CONFIG_CRYPTO_LIB_CHACHA is not set
+# CONFIG_CRYPTO_LIB_CURVE25519 is not set
+CONFIG_CRYPTO_LIB_DES=y
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=4
+# CONFIG_CRYPTO_LIB_POLY1305 is not set
+# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_LIB_SHA256=y
 # CONFIG_CRYPTO_HW is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
@@ -5974,6 +5970,8 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
 
 #
@@ -5984,7 +5982,6 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_INSTALL is not set
 CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
@@ -5994,9 +5991,20 @@ CONFIG_STACK_VALIDATION=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # end of Compile-time checks and compiler options
 
+#
+# Generic Kernel Debugging Instruments
+#
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_DEBUG_FS=y
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
+# end of Generic Kernel Debugging Instruments
+
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_MISC=y
 
@@ -6015,25 +6023,27 @@ CONFIG_DEBUG_MISC=y
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_SCHED_STACK_END_CHECK is not set
 # CONFIG_DEBUG_VM is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 # CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
 # end of Memory Debugging
 
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
 #
-# Debug Lockups and Hangs
+# Debug Oops, Lockups and Hangs
 #
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@@ -6048,14 +6058,15 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
+# end of Debug Oops, Lockups and Hangs
 
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
+#
+# Scheduler Debugging
+#
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
+# end of Scheduler Debugging
+
 # CONFIG_DEBUG_TIMEKEEPING is not set
 
 #
@@ -6080,11 +6091,17 @@ CONFIG_TRACE_IRQFLAGS=y
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
+
+#
+# Debug kernel data structures
+#
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# end of Debug kernel data structures
+
 # CONFIG_DEBUG_CREDENTIALS is not set
 
 #
@@ -6100,9 +6117,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
@@ -6110,6 +6124,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_FENTRY=y
@@ -6147,18 +6162,32 @@ CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 # CONFIG_FUNCTION_PROFILER is not set
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
 CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_MMIOTRACE is not set
 # CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+# end of Kernel hacking
+
+#
+# Kernel Testing and Coverage
+#
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
@@ -6198,16 +6227,14 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
+
+#
+# x86 Debugging
+#
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_EARLY_PRINTK is not set
@@ -6232,4 +6259,5 @@ CONFIG_X86_DEBUG_FPU=y
 # CONFIG_UNWINDER_ORC is not set
 CONFIG_UNWINDER_FRAME_POINTER=y
 # CONFIG_UNWINDER_GUESS is not set
-# end of Kernel hacking
+# end of x86 Debugging
+# end of Kernel Testing and Coverage

From 6b28a749b4a916fd5e46b28fd944faf6f181472b Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 9 Dec 2019 05:52:03 +0000
Subject: [PATCH 06/20] linux (Generic): disable nvidia until fixed

Broken by removal of include/drm/drmP.h

See: https://github.com/torvalds/linux/commit/4e98f871bcffa322850c73d22c66bbd7af2a0374
---
 distributions/LibreELEC/options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 6b8c2c5db0..1ad553c273 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -138,7 +138,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 nvidia nvidia-legacy vmware virtio"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 vmware virtio"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"

From 843e0a87a08093f3c798f9552c93b0539cd80e7a Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 16 Dec 2019 01:48:30 +0000
Subject: [PATCH 07/20] linux (Generic): update to linux-5.5-rc2

---
 packages/linux/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 60c309cbb9..a39ae275bb 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -29,8 +29,8 @@ case "$LINUX" in
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;
   *)
-    PKG_VERSION="5.5-rc1"
-    PKG_SHA256="b739f74a099f96128eecad8bad6346f0f41df7e526846e21b912c985c0175a34"
+    PKG_VERSION="5.5-rc2"
+    PKG_SHA256="aca303b87c818cb41c2ddfd4c06d3fcaa85e935fbd61ea203232ccd2a81844bb"
     PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz"
     PKG_PATCH_DIRS="default"
     ;;

From b70676f2735e454678e0fd5501f30ae7c1da2b21 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 16 Dec 2019 01:53:11 +0000
Subject: [PATCH 08/20] linux (Generic): config options for 5.5-rc2

---
 projects/Generic/linux/linux.x86_64.conf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index 14e4418399..4d3e12bed1 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.5.0-rc1 Kernel Configuration
+# Linux/x86_64 5.5.0-rc2 Kernel Configuration
 #
 
 #
@@ -3050,7 +3050,6 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
 # CONFIG_THERMAL_GOV_FAIR_SHARE is not set
 CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
@@ -5743,7 +5742,7 @@ CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
 CONFIG_CRYPTO_XXHASH=y
-# CONFIG_CRYPTO_BLAKE2B is not set
+CONFIG_CRYPTO_BLAKE2B=y
 # CONFIG_CRYPTO_BLAKE2S is not set
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 # CONFIG_CRYPTO_CRCT10DIF is not set

From 5867941f67f3916a5950700682e26b8bc1d5b959 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 23 Dec 2019 22:28:14 +0000
Subject: [PATCH 09/20] linux (Generic): update to linux-5.5-rc3

---
 packages/linux/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index a39ae275bb..7e6030f4fe 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -29,8 +29,8 @@ case "$LINUX" in
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;
   *)
-    PKG_VERSION="5.5-rc2"
-    PKG_SHA256="aca303b87c818cb41c2ddfd4c06d3fcaa85e935fbd61ea203232ccd2a81844bb"
+    PKG_VERSION="5.5-rc3"
+    PKG_SHA256="2d22fd62ba973b4a156fb5f72437937260a657c0cf0060dcae8099161a49c3e5"
     PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz"
     PKG_PATCH_DIRS="default"
     ;;

From 06887fe37be03ce8a2fbbcf966e6301db6e99b84 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 23 Dec 2019 22:32:11 +0000
Subject: [PATCH 10/20] linux (Generic): config options for 5.5-rc3

---
 projects/Generic/linux/linux.x86_64.conf | 80 ++++++++++++------------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index 4d3e12bed1..c1a07f0e44 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.5.0-rc2 Kernel Configuration
+# Linux/x86_64 5.5.0-rc3 Kernel Configuration
 #
 
 #
@@ -2800,7 +2800,6 @@ CONFIG_PINCTRL_ICELAKE=y
 CONFIG_PINCTRL_LEWISBURG=y
 CONFIG_PINCTRL_SUNRISEPOINT=y
 CONFIG_PINCTRL_TIGERLAKE=y
-# CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_GPIO_ACPI=y
@@ -5618,7 +5617,6 @@ CONFIG_IO_WQ=y
 # Security options
 #
 CONFIG_KEYS=y
-CONFIG_KEYS_COMPAT=y
 CONFIG_KEYS_REQUEST_CACHE=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
@@ -6175,15 +6173,47 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_KUNIT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-# end of Kernel hacking
+# CONFIG_SAMPLES is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_IO_STRICT_DEVMEM is not set
+
+#
+# x86 Debugging
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_EARLY_PRINTK is not set
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
+# CONFIG_DEBUG_WX is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+# CONFIG_PUNIT_ATOM_DEBUG is not set
+# CONFIG_UNWINDER_ORC is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_UNWINDER_GUESS is not set
+# end of x86 Debugging
 
 #
 # Kernel Testing and Coverage
 #
+# CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -6226,37 +6256,5 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
-# CONFIG_SAMPLES is not set
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-# CONFIG_IO_STRICT_DEVMEM is not set
-
-#
-# x86 Debugging
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_EARLY_PRINTK is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_DEBUG_WX is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_DEBUG is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_DEBUG_ENTRY is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-CONFIG_X86_DEBUG_FPU=y
-# CONFIG_PUNIT_ATOM_DEBUG is not set
-# CONFIG_UNWINDER_ORC is not set
-CONFIG_UNWINDER_FRAME_POINTER=y
-# CONFIG_UNWINDER_GUESS is not set
-# end of x86 Debugging
 # end of Kernel Testing and Coverage
+# end of Kernel hacking

From a7630b56ca2614f513dae2f7d7b0c5be13dac01c Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 23 Dec 2019 22:29:04 +0000
Subject: [PATCH 11/20] xf86-video-nvidia-legacy: re-enable 340.108 driver
 (#4075)

---
 distributions/LibreELEC/options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 1ad553c273..59dcec7208 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -138,7 +138,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 vmware virtio"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 nvidia-legacy vmware virtio"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"

From c266eaadfa8ff034611b66879ddcb67826715bd6 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 24 Dec 2019 02:29:38 +0000
Subject: [PATCH 12/20] xf86-video-nvidia: add kernel patch, and enable

---
 distributions/LibreELEC/options               |   2 +-
 ...video-nvidia-0000-fix-for-kernel-5.5.patch | 412 ++++++++++++++++++
 2 files changed, 413 insertions(+), 1 deletion(-)
 create mode 100644 packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch

diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 59dcec7208..6b8c2c5db0 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -138,7 +138,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 nvidia-legacy vmware virtio"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 nvidia nvidia-legacy vmware virtio"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"
diff --git a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch b/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch
new file mode 100644
index 0000000000..2cd11cefce
--- /dev/null
+++ b/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch
@@ -0,0 +1,412 @@
+From 237dbf195aa9e0341579821fcbcca1947040582c Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Tue, 24 Dec 2019 02:38:46 +0000
+Subject: [PATCH] Fix for kernel 5.5-rc
+
+Credit: https://devtalk.nvidia.com/default/topic/1068332/linux/nvidia-driver-does-not-build-on-linux-v5-5-release-candidate-kernel/post/5411562/#5411562
+---
+ kernel/common/inc/nv-drm.h                  | 36 +++++++++++++++++++++
+ kernel/conftest.sh                          | 31 ++++++++++++++++++
+ kernel/nvidia-drm/nvidia-drm-connector.c    | 14 ++++++++
+ kernel/nvidia-drm/nvidia-drm-connector.h    |  2 +-
+ kernel/nvidia-drm/nvidia-drm-crtc.h         |  2 +-
+ kernel/nvidia-drm/nvidia-drm-drv.c          |  2 +-
+ kernel/nvidia-drm/nvidia-drm-encoder.h      |  2 +-
+ kernel/nvidia-drm/nvidia-drm-fb.h           |  2 +-
+ kernel/nvidia-drm/nvidia-drm-gem.h          |  2 +-
+ kernel/nvidia-drm/nvidia-drm-helper.c       |  2 +-
+ kernel/nvidia-drm/nvidia-drm-helper.h       |  2 +-
+ kernel/nvidia-drm/nvidia-drm-modeset.h      |  2 +-
+ kernel/nvidia-drm/nvidia-drm-os-interface.h |  2 +-
+ kernel/nvidia-drm/nvidia-drm-prime-fence.h  |  2 +-
+ kernel/nvidia-drm/nvidia-drm-priv.h         |  2 +-
+ kernel/nvidia-drm/nvidia-drm-utils.h        |  2 +-
+ 16 files changed, 94 insertions(+), 13 deletions(-)
+ create mode 100644 kernel/common/inc/nv-drm.h
+
+diff --git a/kernel/common/inc/nv-drm.h b/kernel/common/inc/nv-drm.h
+new file mode 100644
+index 0000000..07e9f3c
+--- /dev/null
++++ b/kernel/common/inc/nv-drm.h
+@@ -0,0 +1,36 @@
++#ifndef _NV_DRM_H_
++#define _NV_DRM_H_
++
++#include "conftest.h"
++
++#if defined(NV_DRM_DRMP_H_PRESENT)
++#include <drm/drmP.h>
++#else
++#include <linux/agp_backend.h>
++#include <linux/file.h>
++#include <linux/init.h>
++#include <linux/jiffies.h>
++#include <linux/kernel.h>
++#include <linux/mutex.h>
++#include <linux/slab.h>
++#include <linux/types.h>
++#include <asm/pgalloc.h>
++#include <linux/uaccess.h>
++
++#include <uapi/drm/drm.h>
++#include <uapi/drm/drm_mode.h>
++
++#include <drm/drm_agpsupport.h>
++#include <drm/drm_crtc.h>
++#include <drm/drm_drv.h>
++#include <drm/drm_prime.h>
++#include <drm/drm_pci.h>
++#include <drm/drm_ioctl.h>
++#include <drm/drm_sysfs.h>
++#include <drm/drm_vblank.h>
++#include <drm/drm_device.h>
++
++#include <drm/drm_gem.h>
++#endif
++
++#endif
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index c9c2db3..dd22bb0 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1150,6 +1150,9 @@ compile_test() {
+             CODE="
+             #if defined(NV_DRM_DRMP_H_PRESENT)
+             #include <drm/drmP.h>
++            #else
++            #include <drm/drm_drv.h>
++            #include <drm/drm_prime.h>
+             #endif
+             #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
+             #error DRM not enabled
+@@ -1781,6 +1784,8 @@ compile_test() {
+             echo "$CONFTEST_PREAMBLE
+             #if defined(NV_DRM_DRMP_H_PRESENT)
+             #include <drm/drmP.h>
++            #else
++            #include <drm/drm_drv.h>
+             #endif
+             #include <drm/drm_atomic.h>
+             #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
+@@ -1909,7 +1914,11 @@ compile_test() {
+             # attached drivers") in v3.14 (2013-12-11)
+             #
+             CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
+             #include <drm/drmP.h>
++            #else
++            #include <drm/drm_drv.h>
++            #endif
+             int conftest_drm_driver_has_legacy_dev_list(void) {
+                 return offsetof(struct drm_driver, legacy_dev_list);
+             }"
+@@ -1933,7 +1942,11 @@ compile_test() {
+             #   2017-07-23  e6fc3b68558e4c6d8d160b5daf2511b99afa8814
+             #
+             CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
+             #include <drm/drmP.h>
++            #else
++            #include <drm/drm_crtc.h>
++            #endif
+ 
+             int conftest_drm_crtc_init_with_planes_has_name_arg(void) {
+                 return
+@@ -1949,7 +1962,11 @@ compile_test() {
+             compile_check_conftest "$CODE" "NV_DRM_CRTC_INIT_WITH_PLANES_HAS_NAME_ARG" "" "types"
+ 
+             CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
+             #include <drm/drmP.h>
++            #else
++            #include <drm/drm_encoder.h>
++            #endif
+ 
+             int conftest_drm_encoder_init_has_name_arg(void) {
+                 return
+@@ -1964,7 +1981,11 @@ compile_test() {
+             compile_check_conftest "$CODE" "NV_DRM_ENCODER_INIT_HAS_NAME_ARG" "" "types"
+ 
+             echo "$CONFTEST_PREAMBLE
++            #if defined(NV_DRM_DRMP_H_PRESENT)
+             #include <drm/drmP.h>
++            #else
++            #include <drm/drm_plane.h>
++            #endif
+ 
+             int conftest_drm_universal_plane_init_has_format_modifiers_arg(void) {
+                 return
+@@ -1991,7 +2012,11 @@ compile_test() {
+                 echo "#undef NV_DRM_UNIVERSAL_PLANE_INIT_HAS_FORMAT_MODIFIERS_ARG" | append_conftest "types"
+ 
+                 echo "$CONFTEST_PREAMBLE
++                #if defined(NV_DRM_DRMP_H_PRESENT)
+                 #include <drm/drmP.h>
++                #else
++                #include <drm/drm_plane.h>
++                #endif
+ 
+                 int conftest_drm_universal_plane_init_has_name_arg(void) {
+                     return
+@@ -3084,7 +3109,9 @@ compile_test() {
+             # drm_framebuffer_{get,put}()") in v4.12 (2017-02-28).
+             #
+             CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
+             #include <drm/drmP.h>
++            #endif
+             #if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
+             #include <drm/drm_framebuffer.h>
+             #endif
+@@ -3103,7 +3130,9 @@ compile_test() {
+             # drm_gem_object_{get,put}()") in v4.12 (2017-02-28).
+             #
+             CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
+             #include <drm/drmP.h>
++            #endif
+             #if defined(NV_DRM_DRM_GEM_H_PRESENT)
+             #include <drm/drm_gem.h>
+             #endif
+@@ -3122,7 +3151,9 @@ compile_test() {
+             # functions") in v4.15 (2017-09-26).
+             #
+             CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
+             #include <drm/drmP.h>
++            #endif
+             #if defined(NV_DRM_DRM_DRV_H_PRESENT)
+             #include <drm/drm_drv.h>
+             #endif
+diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
+index 1553ebc..f851561 100644
+--- a/kernel/nvidia-drm/nvidia-drm-connector.c
++++ b/kernel/nvidia-drm/nvidia-drm-connector.c
+@@ -20,6 +20,8 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+ 
++#include <linux/version.h>
++
+ #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
+ 
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+@@ -71,7 +73,11 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
+     struct nv_drm_encoder *nv_detected_encoder = NULL;
+ 
+     struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
+     unsigned int i;
++#else
++    struct drm_encoder *encoder = NULL;
++#endif
+ 
+     BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));
+ 
+@@ -87,11 +93,16 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
+         goto done;
+     }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
+     for (i = 0;
+          i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) {
+         struct drm_encoder *encoder;
++#else
++    drm_connector_for_each_possible_encoder(connector, encoder) {
++#endif
+         struct nv_drm_encoder *nv_encoder;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
+         if (connector->encoder_ids[i] == 0) {
+             break;
+         }
+@@ -102,6 +113,7 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
+             BUG_ON(encoder != NULL);
+             continue;
+         }
++#endif
+ 
+         /*
+          * DVI-I connectors can drive both digital and analog
+@@ -169,6 +181,8 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
+             }
+ 
+             detected_encoder = encoder;
++
++            break;
+         }
+     }
+ 
+diff --git a/kernel/nvidia-drm/nvidia-drm-connector.h b/kernel/nvidia-drm/nvidia-drm-connector.h
+index f74e22c..099390d 100644
+--- a/kernel/nvidia-drm/nvidia-drm-connector.h
++++ b/kernel/nvidia-drm/nvidia-drm-connector.h
+@@ -27,7 +27,7 @@
+ 
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ 
+ #include "nvtypes.h"
+ #include "nvkms-api-types.h"
+diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.h b/kernel/nvidia-drm/nvidia-drm-crtc.h
+index 31ef3b5..5de3a51 100644
+--- a/kernel/nvidia-drm/nvidia-drm-crtc.h
++++ b/kernel/nvidia-drm/nvidia-drm-crtc.h
+@@ -29,7 +29,7 @@
+ 
+ #include "nvidia-drm-helper.h"
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvtypes.h"
+ #include "nvkms-kapi.h"
+ 
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index a66d3cc..06bf859 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -39,7 +39,7 @@
+ 
+ #include "nvidia-drm-ioctl.h"
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ 
+ /*
+  * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
+diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.h b/kernel/nvidia-drm/nvidia-drm-encoder.h
+index bbaf986..af341a8 100644
+--- a/kernel/nvidia-drm/nvidia-drm-encoder.h
++++ b/kernel/nvidia-drm/nvidia-drm-encoder.h
+@@ -32,7 +32,7 @@
+ #if defined(NV_DRM_DRM_ENCODER_H_PRESENT)
+ #include <drm/drm_encoder.h>
+ #else
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #endif
+ 
+ #include "nvkms-kapi.h"
+diff --git a/kernel/nvidia-drm/nvidia-drm-fb.h b/kernel/nvidia-drm/nvidia-drm-fb.h
+index 7f292ce..d13bc4c 100644
+--- a/kernel/nvidia-drm/nvidia-drm-fb.h
++++ b/kernel/nvidia-drm/nvidia-drm-fb.h
+@@ -27,7 +27,7 @@
+ 
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvidia-drm-gem-nvkms-memory.h"
+ #include "nvkms-kapi.h"
+ 
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h
+index b621969..326f810 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem.h
++++ b/kernel/nvidia-drm/nvidia-drm-gem.h
+@@ -29,7 +29,7 @@
+ 
+ #include "nvidia-drm-priv.h"
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvkms-kapi.h"
+ 
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+diff --git a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c
+index da602ac..e5d6daa 100644
+--- a/kernel/nvidia-drm/nvidia-drm-helper.c
++++ b/kernel/nvidia-drm/nvidia-drm-helper.c
+@@ -31,7 +31,7 @@
+ 
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #if defined(NV_DRM_DRM_ATOMIC_UAPI_H_PRESENT)
+ #include <drm/drm_atomic_uapi.h>
+ #endif
+diff --git a/kernel/nvidia-drm/nvidia-drm-helper.h b/kernel/nvidia-drm/nvidia-drm-helper.h
+index 8f050d8..71c4b90 100644
+--- a/kernel/nvidia-drm/nvidia-drm-helper.h
++++ b/kernel/nvidia-drm/nvidia-drm-helper.h
+@@ -27,7 +27,7 @@
+ 
+ #if defined(NV_DRM_AVAILABLE)
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ 
+ /*
+  * drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d
+diff --git a/kernel/nvidia-drm/nvidia-drm-modeset.h b/kernel/nvidia-drm/nvidia-drm-modeset.h
+index 06659c5..e9d7b70 100644
+--- a/kernel/nvidia-drm/nvidia-drm-modeset.h
++++ b/kernel/nvidia-drm/nvidia-drm-modeset.h
+@@ -27,7 +27,7 @@
+ 
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ 
+ struct drm_atomic_state *nv_drm_atomic_state_alloc(struct drm_device *dev);
+ void nv_drm_atomic_state_clear(struct drm_atomic_state *state);
+diff --git a/kernel/nvidia-drm/nvidia-drm-os-interface.h b/kernel/nvidia-drm/nvidia-drm-os-interface.h
+index f43f851..7f4ff8b 100644
+--- a/kernel/nvidia-drm/nvidia-drm-os-interface.h
++++ b/kernel/nvidia-drm/nvidia-drm-os-interface.h
+@@ -29,7 +29,7 @@
+ 
+ #if defined(NV_DRM_AVAILABLE)
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ 
+ /* Set to true when the atomic modeset feature is enabled. */
+ extern bool nv_drm_modeset_module_param;
+diff --git a/kernel/nvidia-drm/nvidia-drm-prime-fence.h b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
+index 20da923..f3cc2b4 100644
+--- a/kernel/nvidia-drm/nvidia-drm-prime-fence.h
++++ b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
+@@ -27,7 +27,7 @@
+ 
+ #if defined(NV_DRM_AVAILABLE)
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ 
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+ 
+diff --git a/kernel/nvidia-drm/nvidia-drm-priv.h b/kernel/nvidia-drm/nvidia-drm-priv.h
+index 9076835..77a95f3 100644
+--- a/kernel/nvidia-drm/nvidia-drm-priv.h
++++ b/kernel/nvidia-drm/nvidia-drm-priv.h
+@@ -27,7 +27,7 @@
+ 
+ #if defined(NV_DRM_AVAILABLE)
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ 
+ #if defined(NV_DRM_DRM_GEM_H_PRESENT)
+ #include <drm/drm_gem.h>
+diff --git a/kernel/nvidia-drm/nvidia-drm-utils.h b/kernel/nvidia-drm/nvidia-drm-utils.h
+index 6d24120..95190c4 100644
+--- a/kernel/nvidia-drm/nvidia-drm-utils.h
++++ b/kernel/nvidia-drm/nvidia-drm-utils.h
+@@ -27,7 +27,7 @@
+ 
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+ 
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvkms-kapi.h"
+ 
+ struct NvKmsKapiConnectorInfo*
+-- 
+2.20.1
+

From 12426365b0f8cab2d007a431745964a72ec99bab Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 30 Dec 2019 23:35:49 +0000
Subject: [PATCH 13/20] linux (Generic): update to linux-5.5-rc4

---
 packages/linux/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 7e6030f4fe..22c79c1faf 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -29,8 +29,8 @@ case "$LINUX" in
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;
   *)
-    PKG_VERSION="5.5-rc3"
-    PKG_SHA256="2d22fd62ba973b4a156fb5f72437937260a657c0cf0060dcae8099161a49c3e5"
+    PKG_VERSION="5.5-rc4"
+    PKG_SHA256="4bfdffa214d656bc9e5a830700d3f79b8f0dd2551f43d0b84a42e8d6f0cffde3"
     PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz"
     PKG_PATCH_DIRS="default"
     ;;

From 17242e2c84b750a624fb908f2a3daa61d6a6a8bb Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sun, 5 Jan 2020 23:41:40 +0000
Subject: [PATCH 14/20] linux (Generic): update to linux-5.5-rc5

---
 packages/linux/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 22c79c1faf..54033d061c 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -29,8 +29,8 @@ case "$LINUX" in
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;
   *)
-    PKG_VERSION="5.5-rc4"
-    PKG_SHA256="4bfdffa214d656bc9e5a830700d3f79b8f0dd2551f43d0b84a42e8d6f0cffde3"
+    PKG_VERSION="5.5-rc5"
+    PKG_SHA256="b8522013a653c2cf03883c00c66263124e5ffc344a62ed235780b60b18d0b340"
     PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz"
     PKG_PATCH_DIRS="default"
     ;;

From f62b1430ab9566a9bd96b3206058741016225dce Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 13 Jan 2020 16:01:17 +0000
Subject: [PATCH 15/20] linux (Generic): update to linux-5.5-rc6

---
 packages/linux/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 54033d061c..2e6220251c 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -29,8 +29,8 @@ case "$LINUX" in
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;
   *)
-    PKG_VERSION="5.5-rc5"
-    PKG_SHA256="b8522013a653c2cf03883c00c66263124e5ffc344a62ed235780b60b18d0b340"
+    PKG_VERSION="5.5-rc6"
+    PKG_SHA256="82312b5b09dce99eb3c3e162ec07b15b411849de6513df75ce17036b7dd79978"
     PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz"
     PKG_PATCH_DIRS="default"
     ;;

From ce9dcfa2bab7cad7e44abd3c330ae59bf1e4bcb9 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 20 Jan 2020 00:24:28 +0000
Subject: [PATCH 16/20] linux (Generic): update to linux-5.5-rc7

---
 packages/linux/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 2e6220251c..d9ef07ed56 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -29,8 +29,8 @@ case "$LINUX" in
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;
   *)
-    PKG_VERSION="5.5-rc6"
-    PKG_SHA256="82312b5b09dce99eb3c3e162ec07b15b411849de6513df75ce17036b7dd79978"
+    PKG_VERSION="5.5-rc7"
+    PKG_SHA256="2089fa202b1e6337b3afbcc1de784284537da27d76204cd6eda58fc31799d281"
     PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz"
     PKG_PATCH_DIRS="default"
     ;;

From b374b89a3a82c8797432b62be9d726bc4095ecd9 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 27 Jan 2020 05:36:57 +0000
Subject: [PATCH 17/20] linux (Generic): update to linux-5.5

---
 packages/linux/package.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index d9ef07ed56..0b2346b26e 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -29,9 +29,9 @@ case "$LINUX" in
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;
   *)
-    PKG_VERSION="5.5-rc7"
-    PKG_SHA256="2089fa202b1e6337b3afbcc1de784284537da27d76204cd6eda58fc31799d281"
-    PKG_URL="https://git.kernel.org/torvalds/t/$PKG_NAME-$PKG_VERSION.tar.gz"
+    PKG_VERSION="5.5"
+    PKG_SHA256="a6fbd4ee903c128367892c2393ee0d9657b6ed3ea90016d4dc6f1f6da20b2330"
+    PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz"
     PKG_PATCH_DIRS="default"
     ;;
 esac

From ae2a4d1ece5414bfe9e145d4fc34dc7c7da064e3 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 3 Feb 2020 22:25:17 +0000
Subject: [PATCH 18/20] xf86-video-nvidia: update to xf86-video-nvidia-440.59

---
 .../x11/driver/xf86-video-nvidia/package.mk   |   4 +-
 ...video-nvidia-0000-fix-for-kernel-5.5.patch | 412 ------------------
 .../xf86-video-nvidia/udev.d/96-nvidia.rules  |   4 +
 3 files changed, 6 insertions(+), 414 deletions(-)
 delete mode 100644 packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch

diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk
index 741e175af8..ae6b5e61f0 100644
--- a/packages/x11/driver/xf86-video-nvidia/package.mk
+++ b/packages/x11/driver/xf86-video-nvidia/package.mk
@@ -6,8 +6,8 @@ PKG_NAME="xf86-video-nvidia"
 # Remember to run "python packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to
 # "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version.
 # Host may require installation of python-lxml and python-requests packages.
-PKG_VERSION="440.44"
-PKG_SHA256="794fdfc8e65c203ae482f59df7e55050ddcf0a11af2a95eaa1a10c7d48ec7e0f"
+PKG_VERSION="440.59"
+PKG_SHA256="87c05aeadd260034b4d429de5be8032ead2103adee7aedc1adbb15c0ce3c6f28"
 PKG_ARCH="x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.nvidia.com/"
diff --git a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch b/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch
deleted file mode 100644
index 2cd11cefce..0000000000
--- a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From 237dbf195aa9e0341579821fcbcca1947040582c Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Tue, 24 Dec 2019 02:38:46 +0000
-Subject: [PATCH] Fix for kernel 5.5-rc
-
-Credit: https://devtalk.nvidia.com/default/topic/1068332/linux/nvidia-driver-does-not-build-on-linux-v5-5-release-candidate-kernel/post/5411562/#5411562
----
- kernel/common/inc/nv-drm.h                  | 36 +++++++++++++++++++++
- kernel/conftest.sh                          | 31 ++++++++++++++++++
- kernel/nvidia-drm/nvidia-drm-connector.c    | 14 ++++++++
- kernel/nvidia-drm/nvidia-drm-connector.h    |  2 +-
- kernel/nvidia-drm/nvidia-drm-crtc.h         |  2 +-
- kernel/nvidia-drm/nvidia-drm-drv.c          |  2 +-
- kernel/nvidia-drm/nvidia-drm-encoder.h      |  2 +-
- kernel/nvidia-drm/nvidia-drm-fb.h           |  2 +-
- kernel/nvidia-drm/nvidia-drm-gem.h          |  2 +-
- kernel/nvidia-drm/nvidia-drm-helper.c       |  2 +-
- kernel/nvidia-drm/nvidia-drm-helper.h       |  2 +-
- kernel/nvidia-drm/nvidia-drm-modeset.h      |  2 +-
- kernel/nvidia-drm/nvidia-drm-os-interface.h |  2 +-
- kernel/nvidia-drm/nvidia-drm-prime-fence.h  |  2 +-
- kernel/nvidia-drm/nvidia-drm-priv.h         |  2 +-
- kernel/nvidia-drm/nvidia-drm-utils.h        |  2 +-
- 16 files changed, 94 insertions(+), 13 deletions(-)
- create mode 100644 kernel/common/inc/nv-drm.h
-
-diff --git a/kernel/common/inc/nv-drm.h b/kernel/common/inc/nv-drm.h
-new file mode 100644
-index 0000000..07e9f3c
---- /dev/null
-+++ b/kernel/common/inc/nv-drm.h
-@@ -0,0 +1,36 @@
-+#ifndef _NV_DRM_H_
-+#define _NV_DRM_H_
-+
-+#include "conftest.h"
-+
-+#if defined(NV_DRM_DRMP_H_PRESENT)
-+#include <drm/drmP.h>
-+#else
-+#include <linux/agp_backend.h>
-+#include <linux/file.h>
-+#include <linux/init.h>
-+#include <linux/jiffies.h>
-+#include <linux/kernel.h>
-+#include <linux/mutex.h>
-+#include <linux/slab.h>
-+#include <linux/types.h>
-+#include <asm/pgalloc.h>
-+#include <linux/uaccess.h>
-+
-+#include <uapi/drm/drm.h>
-+#include <uapi/drm/drm_mode.h>
-+
-+#include <drm/drm_agpsupport.h>
-+#include <drm/drm_crtc.h>
-+#include <drm/drm_drv.h>
-+#include <drm/drm_prime.h>
-+#include <drm/drm_pci.h>
-+#include <drm/drm_ioctl.h>
-+#include <drm/drm_sysfs.h>
-+#include <drm/drm_vblank.h>
-+#include <drm/drm_device.h>
-+
-+#include <drm/drm_gem.h>
-+#endif
-+
-+#endif
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index c9c2db3..dd22bb0 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1150,6 +1150,9 @@ compile_test() {
-             CODE="
-             #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_drv.h>
-+            #include <drm/drm_prime.h>
-             #endif
-             #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
-             #error DRM not enabled
-@@ -1781,6 +1784,8 @@ compile_test() {
-             echo "$CONFTEST_PREAMBLE
-             #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_drv.h>
-             #endif
-             #include <drm/drm_atomic.h>
-             #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
-@@ -1909,7 +1914,11 @@ compile_test() {
-             # attached drivers") in v3.14 (2013-12-11)
-             #
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_drv.h>
-+            #endif
-             int conftest_drm_driver_has_legacy_dev_list(void) {
-                 return offsetof(struct drm_driver, legacy_dev_list);
-             }"
-@@ -1933,7 +1942,11 @@ compile_test() {
-             #   2017-07-23  e6fc3b68558e4c6d8d160b5daf2511b99afa8814
-             #
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_crtc.h>
-+            #endif
- 
-             int conftest_drm_crtc_init_with_planes_has_name_arg(void) {
-                 return
-@@ -1949,7 +1962,11 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_DRM_CRTC_INIT_WITH_PLANES_HAS_NAME_ARG" "" "types"
- 
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_encoder.h>
-+            #endif
- 
-             int conftest_drm_encoder_init_has_name_arg(void) {
-                 return
-@@ -1964,7 +1981,11 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_DRM_ENCODER_INIT_HAS_NAME_ARG" "" "types"
- 
-             echo "$CONFTEST_PREAMBLE
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_plane.h>
-+            #endif
- 
-             int conftest_drm_universal_plane_init_has_format_modifiers_arg(void) {
-                 return
-@@ -1991,7 +2012,11 @@ compile_test() {
-                 echo "#undef NV_DRM_UNIVERSAL_PLANE_INIT_HAS_FORMAT_MODIFIERS_ARG" | append_conftest "types"
- 
-                 echo "$CONFTEST_PREAMBLE
-+                #if defined(NV_DRM_DRMP_H_PRESENT)
-                 #include <drm/drmP.h>
-+                #else
-+                #include <drm/drm_plane.h>
-+                #endif
- 
-                 int conftest_drm_universal_plane_init_has_name_arg(void) {
-                     return
-@@ -3084,7 +3109,9 @@ compile_test() {
-             # drm_framebuffer_{get,put}()") in v4.12 (2017-02-28).
-             #
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #endif
-             #if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
-             #include <drm/drm_framebuffer.h>
-             #endif
-@@ -3103,7 +3130,9 @@ compile_test() {
-             # drm_gem_object_{get,put}()") in v4.12 (2017-02-28).
-             #
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #endif
-             #if defined(NV_DRM_DRM_GEM_H_PRESENT)
-             #include <drm/drm_gem.h>
-             #endif
-@@ -3122,7 +3151,9 @@ compile_test() {
-             # functions") in v4.15 (2017-09-26).
-             #
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #endif
-             #if defined(NV_DRM_DRM_DRV_H_PRESENT)
-             #include <drm/drm_drv.h>
-             #endif
-diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
-index 1553ebc..f851561 100644
---- a/kernel/nvidia-drm/nvidia-drm-connector.c
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.c
-@@ -20,6 +20,8 @@
-  * DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include <linux/version.h>
-+
- #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -71,7 +73,11 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
-     struct nv_drm_encoder *nv_detected_encoder = NULL;
- 
-     struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
-     unsigned int i;
-+#else
-+    struct drm_encoder *encoder = NULL;
-+#endif
- 
-     BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));
- 
-@@ -87,11 +93,16 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
-         goto done;
-     }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
-     for (i = 0;
-          i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) {
-         struct drm_encoder *encoder;
-+#else
-+    drm_connector_for_each_possible_encoder(connector, encoder) {
-+#endif
-         struct nv_drm_encoder *nv_encoder;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
-         if (connector->encoder_ids[i] == 0) {
-             break;
-         }
-@@ -102,6 +113,7 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
-             BUG_ON(encoder != NULL);
-             continue;
-         }
-+#endif
- 
-         /*
-          * DVI-I connectors can drive both digital and analog
-@@ -169,6 +181,8 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
-             }
- 
-             detected_encoder = encoder;
-+
-+            break;
-         }
-     }
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-connector.h b/kernel/nvidia-drm/nvidia-drm-connector.h
-index f74e22c..099390d 100644
---- a/kernel/nvidia-drm/nvidia-drm-connector.h
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- #include "nvtypes.h"
- #include "nvkms-api-types.h"
-diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.h b/kernel/nvidia-drm/nvidia-drm-crtc.h
-index 31ef3b5..5de3a51 100644
---- a/kernel/nvidia-drm/nvidia-drm-crtc.h
-+++ b/kernel/nvidia-drm/nvidia-drm-crtc.h
-@@ -29,7 +29,7 @@
- 
- #include "nvidia-drm-helper.h"
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvtypes.h"
- #include "nvkms-kapi.h"
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
-index a66d3cc..06bf859 100644
---- a/kernel/nvidia-drm/nvidia-drm-drv.c
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
-@@ -39,7 +39,7 @@
- 
- #include "nvidia-drm-ioctl.h"
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- /*
-  * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
-diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.h b/kernel/nvidia-drm/nvidia-drm-encoder.h
-index bbaf986..af341a8 100644
---- a/kernel/nvidia-drm/nvidia-drm-encoder.h
-+++ b/kernel/nvidia-drm/nvidia-drm-encoder.h
-@@ -32,7 +32,7 @@
- #if defined(NV_DRM_DRM_ENCODER_H_PRESENT)
- #include <drm/drm_encoder.h>
- #else
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #endif
- 
- #include "nvkms-kapi.h"
-diff --git a/kernel/nvidia-drm/nvidia-drm-fb.h b/kernel/nvidia-drm/nvidia-drm-fb.h
-index 7f292ce..d13bc4c 100644
---- a/kernel/nvidia-drm/nvidia-drm-fb.h
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvidia-drm-gem-nvkms-memory.h"
- #include "nvkms-kapi.h"
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h
-index b621969..326f810 100644
---- a/kernel/nvidia-drm/nvidia-drm-gem.h
-+++ b/kernel/nvidia-drm/nvidia-drm-gem.h
-@@ -29,7 +29,7 @@
- 
- #include "nvidia-drm-priv.h"
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvkms-kapi.h"
- 
- #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
-diff --git a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c
-index da602ac..e5d6daa 100644
---- a/kernel/nvidia-drm/nvidia-drm-helper.c
-+++ b/kernel/nvidia-drm/nvidia-drm-helper.c
-@@ -31,7 +31,7 @@
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #if defined(NV_DRM_DRM_ATOMIC_UAPI_H_PRESENT)
- #include <drm/drm_atomic_uapi.h>
- #endif
-diff --git a/kernel/nvidia-drm/nvidia-drm-helper.h b/kernel/nvidia-drm/nvidia-drm-helper.h
-index 8f050d8..71c4b90 100644
---- a/kernel/nvidia-drm/nvidia-drm-helper.h
-+++ b/kernel/nvidia-drm/nvidia-drm-helper.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- /*
-  * drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d
-diff --git a/kernel/nvidia-drm/nvidia-drm-modeset.h b/kernel/nvidia-drm/nvidia-drm-modeset.h
-index 06659c5..e9d7b70 100644
---- a/kernel/nvidia-drm/nvidia-drm-modeset.h
-+++ b/kernel/nvidia-drm/nvidia-drm-modeset.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- struct drm_atomic_state *nv_drm_atomic_state_alloc(struct drm_device *dev);
- void nv_drm_atomic_state_clear(struct drm_atomic_state *state);
-diff --git a/kernel/nvidia-drm/nvidia-drm-os-interface.h b/kernel/nvidia-drm/nvidia-drm-os-interface.h
-index f43f851..7f4ff8b 100644
---- a/kernel/nvidia-drm/nvidia-drm-os-interface.h
-+++ b/kernel/nvidia-drm/nvidia-drm-os-interface.h
-@@ -29,7 +29,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- /* Set to true when the atomic modeset feature is enabled. */
- extern bool nv_drm_modeset_module_param;
-diff --git a/kernel/nvidia-drm/nvidia-drm-prime-fence.h b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
-index 20da923..f3cc2b4 100644
---- a/kernel/nvidia-drm/nvidia-drm-prime-fence.h
-+++ b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-priv.h b/kernel/nvidia-drm/nvidia-drm-priv.h
-index 9076835..77a95f3 100644
---- a/kernel/nvidia-drm/nvidia-drm-priv.h
-+++ b/kernel/nvidia-drm/nvidia-drm-priv.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- #if defined(NV_DRM_DRM_GEM_H_PRESENT)
- #include <drm/drm_gem.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-utils.h b/kernel/nvidia-drm/nvidia-drm-utils.h
-index 6d24120..95190c4 100644
---- a/kernel/nvidia-drm/nvidia-drm-utils.h
-+++ b/kernel/nvidia-drm/nvidia-drm-utils.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvkms-kapi.h"
- 
- struct NvKmsKapiConnectorInfo*
--- 
-2.20.1
-
diff --git a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules
index e93186f8bf..36e4e0b5ba 100644
--- a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules
+++ b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules
@@ -209,6 +209,8 @@ ATTRS{device}=="0x1cba", GOTO="configure_nvidia"
 ATTRS{device}=="0x1cbb", GOTO="configure_nvidia"
 ATTRS{device}=="0x1cbc", GOTO="configure_nvidia"
 ATTRS{device}=="0x1cbd", GOTO="configure_nvidia"
+ATTRS{device}=="0x1cfa", GOTO="configure_nvidia"
+ATTRS{device}=="0x1cfb", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d01", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d10", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d11", GOTO="configure_nvidia"
@@ -226,6 +228,8 @@ ATTRS{device}=="0x1db6", GOTO="configure_nvidia"
 ATTRS{device}=="0x1db7", GOTO="configure_nvidia"
 ATTRS{device}=="0x1db8", GOTO="configure_nvidia"
 ATTRS{device}=="0x1dba", GOTO="configure_nvidia"
+ATTRS{device}=="0x1df0", GOTO="configure_nvidia"
+ATTRS{device}=="0x1df2", GOTO="configure_nvidia"
 ATTRS{device}=="0x1df5", GOTO="configure_nvidia"
 ATTRS{device}=="0x1df6", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e02", GOTO="configure_nvidia"

From e10f794ea01a074403f15b42884b1599f8630599 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 3 Feb 2020 22:34:17 +0000
Subject: [PATCH 19/20] kernel-firmware: update to kernel-firmware-6d9f399

---
 packages/linux-firmware/kernel-firmware/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk
index 72cfb4639d..20beee175a 100644
--- a/packages/linux-firmware/kernel-firmware/package.mk
+++ b/packages/linux-firmware/kernel-firmware/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="kernel-firmware"
-PKG_VERSION="20200122"
-PKG_SHA256="25572b1946979aa9662284ac30601d8d8c3818ee7f63ebb6e7323e02eb62b83e"
+PKG_VERSION="6d9f39910215a7dc56df3629e7d46b71a592be8e"
+PKG_SHA256="4b7400ec1cd5582f61385837e09a8b5637ae97e5b9c00a3c77a3ccd7703836bf"
 PKG_LICENSE="other"
 PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
 PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.gz"

From 94f9a7747558463118c39fadd8d71a21c67216cc Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 4 Feb 2020 21:44:38 +0000
Subject: [PATCH 20/20] kernel-firmware: update to kernel-firmware-b791e15

---
 packages/linux-firmware/kernel-firmware/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk
index 20beee175a..0420a88474 100644
--- a/packages/linux-firmware/kernel-firmware/package.mk
+++ b/packages/linux-firmware/kernel-firmware/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="kernel-firmware"
-PKG_VERSION="6d9f39910215a7dc56df3629e7d46b71a592be8e"
-PKG_SHA256="4b7400ec1cd5582f61385837e09a8b5637ae97e5b9c00a3c77a3ccd7703836bf"
+PKG_VERSION="b791e15d3e0ac2705eaa7965ed9b6d4c85fef2a2"
+PKG_SHA256="9415d550656974960831fb9a7c96169e67a4bf4b231a444788bc32d17dd2cd63"
 PKG_LICENSE="other"
 PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
 PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.gz"