$ git diff --patch-with-stat --summary 87bc2830c2765adc879712e969d1746e773ec78d..c8b822d29ce1a78dec8070252886d8536383f1c7

 .abf.yml                                           |   2 +-
 ...m-if-pixel-clock-changed-with-link-active.patch | 109 ---------------------
 firmware_rome_error.patch                          |  12 +++
 kernel-release.spec                                |  12 ++-
 linux-5.10-enable-hikey960-gpu.patch               |  34 +++++++
 5 files changed, 54 insertions(+), 115 deletions(-)
 delete mode 100644 8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch
 create mode 100644 firmware_rome_error.patch
 create mode 100644 linux-5.10-enable-hikey960-gpu.patch

diff --git a/.abf.yml b/.abf.yml
index 25992a0..4db0049 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -2,4 +2,4 @@ sources:
   extra-wifi-drivers-20200301.tar.zst: 3390c738c7d91250714ce0f88d26371e93bc40b8
   saa716x-driver.tar.xz: f9b6ef1cd6f1f71f53d9a8aadfba2cf6b5c3d7b6
   linux-5.10.tar.xz: be0b909f1fbb760cc2d5cf146e1da3b2af0cf899
-  patch-5.10.4.xz: 5f98ab1690ac9f6a821c3ad77226a9032a383dae
+  patch-5.10.6.xz: a0d664cb8188c684ec3a63ea50df070965288336
diff --git a/8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch b/8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch
deleted file mode 100644
index 631e709..0000000
--- a/8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 965421096770bb0d69444950c1f839e8e5504da5 Mon Sep 17 00:00:00 2001
-From: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-Date: Tue, 15 Dec 2020 10:45:05 -0500
-Subject: [PATCH] drm/amd/display: Add get_dig_frontend implementation for DCEx
-
-Some old ASICs might not implement/require get_dig_frontend helper; in
-this scenario, we can have a NULL pointer exception when we try to call
-it inside vbios disable operation. For example, this situation might
-happen when using Polaris12 with an eDP panel. This commit avoids this
-situation by adding a specific get_dig_frontend implementation for DCEx.
-
-Cc: Alex Deucher <alexander.deucher@amd.com>
-Cc: Borislav Petkov <bp@alien8.de>
-Cc: Harry Wentland <Harry.Wentland@amd.com>
-Cc: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
-Cc: Chiawen Huang <chiawen.huang@amd.com>
-Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- .../drm/amd/display/dc/dce/dce_link_encoder.c | 45 ++++++++++++++++++-
- .../drm/amd/display/dc/dce/dce_link_encoder.h |  2 +
- 2 files changed, 45 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
-index b409f6b2bfd8..f355cd1e9090 100644
---- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
-+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
-@@ -119,7 +119,8 @@ static const struct link_encoder_funcs dce110_lnk_enc_funcs = {
- 	.disable_hpd = dce110_link_encoder_disable_hpd,
- 	.is_dig_enabled = dce110_is_dig_enabled,
- 	.destroy = dce110_link_encoder_destroy,
--	.get_max_link_cap = dce110_link_encoder_get_max_link_cap
-+	.get_max_link_cap = dce110_link_encoder_get_max_link_cap,
-+	.get_dig_frontend = dce110_get_dig_frontend,
- };
- 
- static enum bp_result link_transmitter_control(
-@@ -235,6 +236,45 @@ static void set_link_training_complete(
- 
- }
- 
-+unsigned int dce110_get_dig_frontend(struct link_encoder *enc)
-+{
-+	struct dce110_link_encoder *enc110 = TO_DCE110_LINK_ENC(enc);
-+	u32 value;
-+	enum engine_id result;
-+
-+	REG_GET(DIG_BE_CNTL, DIG_FE_SOURCE_SELECT, &value);
-+
-+	switch (value) {
-+	case DCE110_DIG_FE_SOURCE_SELECT_DIGA:
-+		result = ENGINE_ID_DIGA;
-+		break;
-+	case DCE110_DIG_FE_SOURCE_SELECT_DIGB:
-+		result = ENGINE_ID_DIGB;
-+		break;
-+	case DCE110_DIG_FE_SOURCE_SELECT_DIGC:
-+		result = ENGINE_ID_DIGC;
-+		break;
-+	case DCE110_DIG_FE_SOURCE_SELECT_DIGD:
-+		result = ENGINE_ID_DIGD;
-+		break;
-+	case DCE110_DIG_FE_SOURCE_SELECT_DIGE:
-+		result = ENGINE_ID_DIGE;
-+		break;
-+	case DCE110_DIG_FE_SOURCE_SELECT_DIGF:
-+		result = ENGINE_ID_DIGF;
-+		break;
-+	case DCE110_DIG_FE_SOURCE_SELECT_DIGG:
-+		result = ENGINE_ID_DIGG;
-+		break;
-+	default:
-+		// invalid source select DIG
-+		ASSERT(false);
-+		result = ENGINE_ID_UNKNOWN;
-+	}
-+
-+	return result;
-+}
-+
- void dce110_link_encoder_set_dp_phy_pattern_training_pattern(
- 	struct link_encoder *enc,
- 	uint32_t index)
-@@ -1665,7 +1705,8 @@ static const struct link_encoder_funcs dce60_lnk_enc_funcs = {
- 	.disable_hpd = dce110_link_encoder_disable_hpd,
- 	.is_dig_enabled = dce110_is_dig_enabled,
- 	.destroy = dce110_link_encoder_destroy,
--	.get_max_link_cap = dce110_link_encoder_get_max_link_cap
-+	.get_max_link_cap = dce110_link_encoder_get_max_link_cap,
-+	.get_dig_frontend = dce110_get_dig_frontend
- };
- 
- void dce60_link_encoder_construct(
-diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
-index cb714a48b171..fc6ade824c23 100644
---- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
-+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
-@@ -295,6 +295,8 @@ void dce110_link_encoder_connect_dig_be_to_fe(
- 	enum engine_id engine,
- 	bool connect);
- 
-+unsigned int dce110_get_dig_frontend(struct link_encoder *enc);
-+
- void dce110_link_encoder_set_dp_phy_pattern_training_pattern(
- 	struct link_encoder *enc,
- 	uint32_t index);
--- 
-2.25.4
-
diff --git a/firmware_rome_error.patch b/firmware_rome_error.patch
new file mode 100644
index 0000000..7482d07
--- /dev/null
+++ b/firmware_rome_error.patch
@@ -0,0 +1,12 @@
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index 03b83aa91277..dfc6c7d1b0e7 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -4070,6 +4070,7 @@ static int btusb_setup_qca(struct hci_dev *hdev)
+ 	}
+ 	if (!info) {
++		if (ver_rom & ~0xffffU) return 0;
+ 		bt_dev_err(hdev, "don't support firmware rome 0x%x", ver_rom);
+ 		return -ENODEV;
+ 	}
+ 
diff --git a/kernel-release.spec b/kernel-release.spec
index de36506..55a86c6 100644
--- a/kernel-release.spec
+++ b/kernel-release.spec
@@ -22,7 +22,7 @@
 # compose tar.xz name and release
 %define kernelversion	5
 %define patchlevel	10
-%define sublevel	4
+%define sublevel	6
 %define relc		%{nil}
 # Only ever wrong on x.0 releases...
 %define previous	%{kernelversion}.%(echo $((%{patchlevel}-1)))
@@ -336,10 +336,6 @@ Patch213:	https://salsa.debian.org/kernel-team/linux/raw/master/debian/patches/d
 # https://gitweb.frugalware.org/frugalware-current/commit/bc3e827af39a321efd770ba4f4de63bca2853471
 Patch214:	https://gitweb.frugalware.org/frugalware-current/raw/master/source/base/kernel/nvme-Patriot_Viper_VPN100-QUIRK_IGNORE_DEV_SUBNQN.patch
 
-# AMDGPU fixes
-# https://patchwork.freedesktop.org/patch/408230/
-Patch220:	8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch
-
 # k10temp fixes
 Patch221:	https://gitweb.frugalware.org/frugalware-current/raw/master/source/base/kernel/0001-Revert-hwmon-k10temp-Remove-support-for-displaying-v.patch
 Patch222:	https://gitweb.frugalware.org/frugalware-current/raw/2fe3eaa10ecbeb59db965230a1d1aa0a775f6b5a/source/base/kernel/k10temp-fix-ZEN2-desktop-add-ZEN3-desktop.patch
@@ -353,6 +349,12 @@ Patch225:	https://gitweb.frugalware.org/frugalware-current/raw/9feb87fc5d15fc0b3
 Patch226:	https://gitweb.frugalware.org/frugalware-current/raw/50690405717979871bb17b8e6b553799a203c6ae/source/base/kernel/0001-Revert-cpufreq-Avoid-configuring-old-governors-as-de.patch
 Patch227:	https://gitweb.frugalware.org/frugalware-current/raw/50690405717979871bb17b8e6b553799a203c6ae/source/base/kernel/revert-parts-of-a00ec3874e7d326ab2dffbed92faddf6a77a84e9-no-Intel-NO.patch
 
+# Fix some Bluetooth chips
+# https://bugzilla.kernel.org/show_bug.cgi?id=210681
+Patch230:	firmware_rome_error.patch
+
+# Enable HiKey 960 GPU
+Patch235:	linux-5.10-enable-hikey960-gpu.patch
 
 # NTFS kernel patches
 # https://lore.kernel.org/lkml/20201225135119.3666763-1-almaz.alexandrovich@paragon-software.com/
diff --git a/linux-5.10-enable-hikey960-gpu.patch b/linux-5.10-enable-hikey960-gpu.patch
new file mode 100644
index 0000000..f91476b
--- /dev/null
+++ b/linux-5.10-enable-hikey960-gpu.patch
@@ -0,0 +1,34 @@
+diff -up linux-5.10/arch/arm64/boot/dts/hisilicon/hi3660-gpu.dtsi.omv~ linux-5.10/arch/arm64/boot/dts/hisilicon/hi3660-gpu.dtsi
+--- linux-5.10/arch/arm64/boot/dts/hisilicon/hi3660-gpu.dtsi.omv~	2021-01-10 01:48:15.445951749 +0100
++++ linux-5.10/arch/arm64/boot/dts/hisilicon/hi3660-gpu.dtsi	2021-01-10 01:51:38.820532078 +0100
+@@ -0,0 +1,19 @@
++/{
++	gpu: mali@E82C0000 {
++		compatible = "arm,malit6xx", "arm,mali-midgard";
++		#cooling-cells = <3>; /* min followed by max */
++		gpu-outstanding = <0x0>;
++		reg = <0x0 0xE82C0000 0x0 0x4000>;
++		interrupts = <0 258 4 0 259 4 0 260 4>;
++		interrupt-names = "JOB", "MMU", "GPU";
++		operating-points = <
++			/* <frequency> <voltage> */
++			178000	650000
++			400000	700000
++			533000	800000
++			807000	900000
++			960000	1000000
++			1037000	1100000
++		>;
++	};
++};
+diff -up linux-5.10/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts.omv~ linux-5.10/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+--- linux-5.10/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts.omv~	2021-01-10 01:51:52.257702620 +0100
++++ linux-5.10/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts	2021-01-10 01:52:07.742899163 +0100
+@@ -10,6 +10,7 @@
+ 
+ #include "hi3660.dtsi"
+ #include "hikey960-pinctrl.dtsi"
++#include "hi3660-gpu.dtsi"
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/input/input.h>
+ #include <dt-bindings/interrupt-controller/irq.h>