Updated to 5.2.10

5 files changed, 98 insertions, 341 deletions

diff --git a/0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch b/0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch
new file mode 100644
index 0000000..b82ce17
--- /dev/null
+++ b/0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch
@@ -0,0 +1,85 @@
+From dd672eb4f207fcb2b26bafa0d61f118c3c11a479 Mon Sep 17 00:00:00 2001
+From: Likun Gao <Likun.Gao@amd.com>
+Date: Fri, 2 Aug 2019 15:18:57 +0800
+Subject: drm/amdgpu: pin the csb buffer on hw init for gfx v8
+
+Without this pin, the csb buffer will be filled with inconsistent
+data after S3 resume. And that will causes gfx hang on gfxoff
+exit since this csb will be executed then.
+
+Signed-off-by: Likun Gao <Likun.Gao@amd.com>
+Tested-by: Paul Gover <pmw.gover@yahoo.co.uk>
+Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
+Reviewed-by: Xiaojie Yuan <xiaojie.yuan@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 40 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+index 02955e6e9dd9..c21ef99cc590 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+@@ -1317,6 +1317,39 @@ static int gfx_v8_0_rlc_init(struct amdgpu_device *adev)
+ 	return 0;
+ }
+ 
++static int gfx_v8_0_csb_vram_pin(struct amdgpu_device *adev)
++{
++	int r;
++
++	r = amdgpu_bo_reserve(adev->gfx.rlc.clear_state_obj, false);
++	if (unlikely(r != 0))
++		return r;
++
++	r = amdgpu_bo_pin(adev->gfx.rlc.clear_state_obj,
++			AMDGPU_GEM_DOMAIN_VRAM);
++	if (!r)
++		adev->gfx.rlc.clear_state_gpu_addr =
++			amdgpu_bo_gpu_offset(adev->gfx.rlc.clear_state_obj);
++
++	amdgpu_bo_unreserve(adev->gfx.rlc.clear_state_obj);
++
++	return r;
++}
++
++static void gfx_v8_0_csb_vram_unpin(struct amdgpu_device *adev)
++{
++	int r;
++
++	if (!adev->gfx.rlc.clear_state_obj)
++		return;
++
++	r = amdgpu_bo_reserve(adev->gfx.rlc.clear_state_obj, true);
++	if (likely(r == 0)) {
++		amdgpu_bo_unpin(adev->gfx.rlc.clear_state_obj);
++		amdgpu_bo_unreserve(adev->gfx.rlc.clear_state_obj);
++	}
++}
++
+ static void gfx_v8_0_mec_fini(struct amdgpu_device *adev)
+ {
+ 	amdgpu_bo_free_kernel(&adev->gfx.mec.hpd_eop_obj, NULL, NULL);
+@@ -4777,6 +4810,10 @@ static int gfx_v8_0_hw_init(void *handle)
+ 	gfx_v8_0_init_golden_registers(adev);
+ 	gfx_v8_0_constants_init(adev);
+ 
++	r = gfx_v8_0_csb_vram_pin(adev);
++	if (r)
++		return r;
++
+ 	r = adev->gfx.rlc.funcs->resume(adev);
+ 	if (r)
+ 		return r;
+@@ -4893,6 +4930,9 @@ static int gfx_v8_0_hw_fini(void *handle)
+ 	else
+ 		pr_err("rlc is busy, skip halt rlc\n");
+ 	amdgpu_gfx_rlc_exit_safe_mode(adev);
++
++	gfx_v8_0_csb_vram_unpin(adev);
++
+ 	return 0;
+ }
+ 
+-- 
+cgit v1.2.1-1-g437b
diff --git a/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch b/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
deleted file mode 100644
index e4fe504..0000000
--- a/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
+++ /dev/null
@@ -1,328 +0,0 @@
-From e7cae1276332a8d1a94e1e0e272c8b9209bdd83f Mon Sep 17 00:00:00 2001
-From: Haim Dreyfuss <haim.dreyfuss@intel.com>
-Date: Wed, 27 Feb 2019 16:43:45 +0200
-Subject: iwlwifi: Add support for SAR South Korea limitation
-
-South Korea is adding a more strict SAR limit called "Limb SAR".
-Currently, WGDS SAR offset group 3 is not used (not mapped to any country).
-In order to be able to comply with South Korea new restriction:
-- OEM will use WGDS SAR offset group 3 to South Korea limitation.
-- OEM will change WGDS revision to 1 (currently latest revision is 0)
-	to notify that Korea Limb SAR applied.
-- Driver will read the WGDS table and pass the values to FW (as usual)
-- Driver will pass to FW an indication that Korea Limb SAR is applied
-	in case table revision is 1.
-
-Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
----
- drivers/net/wireless/intel/iwlwifi/fw/acpi.c      | 28 +++++++-----
- drivers/net/wireless/intel/iwlwifi/fw/acpi.h      |  5 ++-
- drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 12 +++++
- drivers/net/wireless/intel/iwlwifi/fw/file.h      |  3 ++
- drivers/net/wireless/intel/iwlwifi/mvm/fw.c       | 55 ++++++++++++++++-------
- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h      |  1 +
- 6 files changed, 76 insertions(+), 28 deletions(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
-index 405038ce98d6..7573af2d88ce 100644
---- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
-+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
-@@ -97,7 +97,7 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_object);
- 
- union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
- 					 union acpi_object *data,
--					 int data_size)
-+					 int data_size, int *tbl_rev)
- {
- 	int i;
- 	union acpi_object *wifi_pkg;
-@@ -113,16 +113,19 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
- 	/*
- 	 * We need at least two packages, one for the revision and one
- 	 * for the data itself.  Also check that the revision is valid
--	 * (i.e. it is an integer set to 0).
-+	 * (i.e. it is an integer smaller than 2, as we currently support only
-+	 * 2 revisions).
- 	 */
- 	if (data->type != ACPI_TYPE_PACKAGE ||
- 	    data->package.count < 2 ||
- 	    data->package.elements[0].type != ACPI_TYPE_INTEGER ||
--	    data->package.elements[0].integer.value != 0) {
-+	    data->package.elements[0].integer.value > 1) {
- 		IWL_DEBUG_DEV_RADIO(dev, "Unsupported packages structure\n");
- 		return ERR_PTR(-EINVAL);
- 	}
- 
-+	*tbl_rev = data->package.elements[0].integer.value;
-+
- 	/* loop through all the packages to find the one for WiFi */
- 	for (i = 1; i < data->package.count; i++) {
- 		union acpi_object *domain;
-@@ -151,14 +154,15 @@ int iwl_acpi_get_mcc(struct device *dev, char *mcc)
- {
- 	union acpi_object *wifi_pkg, *data;
- 	u32 mcc_val;
--	int ret;
-+	int ret, tbl_rev;
- 
- 	data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD);
- 	if (IS_ERR(data))
- 		return PTR_ERR(data);
- 
--	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg)) {
-+	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE,
-+					 &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
- 		ret = PTR_ERR(wifi_pkg);
- 		goto out_free;
- 	}
-@@ -185,6 +189,7 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev)
- {
- 	union acpi_object *data, *wifi_pkg;
- 	u64 dflt_pwr_limit;
-+	int tbl_rev;
- 
- 	data = iwl_acpi_get_object(dev, ACPI_SPLC_METHOD);
- 	if (IS_ERR(data)) {
-@@ -193,8 +198,8 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev)
- 	}
- 
- 	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data,
--					 ACPI_SPLC_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg) ||
-+					 ACPI_SPLC_WIFI_DATA_SIZE, &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev != 0 ||
- 	    wifi_pkg->package.elements[1].integer.value != ACPI_TYPE_INTEGER) {
- 		dflt_pwr_limit = 0;
- 		goto out_free;
-@@ -211,14 +216,15 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_pwr_limit);
- int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)
- {
- 	union acpi_object *wifi_pkg, *data;
--	int ret;
-+	int ret, tbl_rev;
- 
- 	data = iwl_acpi_get_object(dev, ACPI_ECKV_METHOD);
- 	if (IS_ERR(data))
- 		return PTR_ERR(data);
- 
--	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg)) {
-+	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE,
-+					 &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
- 		ret = PTR_ERR(wifi_pkg);
- 		goto out_free;
- 	}
-diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
-index f5704e16643f..991a23450999 100644
---- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
-+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
-@@ -97,7 +97,7 @@
- void *iwl_acpi_get_object(struct device *dev, acpi_string method);
- union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
- 					 union acpi_object *data,
--					 int data_size);
-+					 int data_size, int *tbl_rev);
- 
- /**
-  * iwl_acpi_get_mcc - read MCC from ACPI, if available
-@@ -131,7 +131,8 @@ static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)
- 
- static inline union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
- 						       union acpi_object *data,
--						       int data_size)
-+						       int data_size,
-+						       int *tbl_rev)
- {
- 	return ERR_PTR(-ENOENT);
- }
-diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
-index 01f003c6cff9..f195db398bed 100644
---- a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
-+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
-@@ -419,14 +419,26 @@ struct iwl_per_chain_offset_group {
- 	struct iwl_per_chain_offset hb;
- } __packed; /* PER_CHAIN_LIMIT_OFFSET_GROUP_S_VER_1 */
- 
-+/**
-+ * struct iwl_geo_tx_power_profile_cmd_v1 - struct for GEO_TX_POWER_LIMIT cmd.
-+ * @ops: operations, value from &enum iwl_geo_per_chain_offset_operation
-+ * @table: offset profile per band.
-+ */
-+struct iwl_geo_tx_power_profiles_cmd_v1 {
-+	__le32 ops;
-+	struct iwl_per_chain_offset_group table[IWL_NUM_GEO_PROFILES];
-+} __packed; /* GEO_TX_POWER_LIMIT_VER_1 */
-+
- /**
-  * struct iwl_geo_tx_power_profile_cmd - struct for GEO_TX_POWER_LIMIT cmd.
-  * @ops: operations, value from &enum iwl_geo_per_chain_offset_operation
-  * @table: offset profile per band.
-+ * @table_revision: BIOS table revision.
-  */
- struct iwl_geo_tx_power_profiles_cmd {
- 	__le32 ops;
- 	struct iwl_per_chain_offset_group table[IWL_NUM_GEO_PROFILES];
-+	__le32 table_revision;
- } __packed; /* GEO_TX_POWER_LIMIT */
- 
- /**
-diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h
-index de9243d30135..a74f34a8dffb 100644
---- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
-+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
-@@ -286,6 +286,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t;
-  *	SCAN_OFFLOAD_PROFILES_QUERY_RSP_S.
-  * @IWL_UCODE_TLV_API_MBSSID_HE: This ucode supports v2 of
-  *	STA_CONTEXT_DOT11AX_API_S
-+ * @IWL_UCODE_TLV_CAPA_SAR_TABLE_VER: This ucode supports different sar
-+ *	version tables.
-  *
-  * @NUM_IWL_UCODE_TLV_API: number of bits used
-  */
-@@ -318,6 +320,7 @@ enum iwl_ucode_tlv_api {
- 	IWL_UCODE_TLV_API_MBSSID_HE		= (__force iwl_ucode_tlv_api_t)52,
- 	IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE	= (__force iwl_ucode_tlv_api_t)53,
- 	IWL_UCODE_TLV_API_FTM_RTT_ACCURACY      = (__force iwl_ucode_tlv_api_t)54,
-+	IWL_UCODE_TLV_API_SAR_TABLE_VER         = (__force iwl_ucode_tlv_api_t)55,
- 
- 	NUM_IWL_UCODE_TLV_API
- #ifdef __CHECKER__
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
-index 559f6df1a74d..8a3e542c47b2 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
-@@ -682,15 +682,15 @@ static int iwl_mvm_sar_get_wrds_table(struct iwl_mvm *mvm)
- {
- 	union acpi_object *wifi_pkg, *table, *data;
- 	bool enabled;
--	int ret;
-+	int ret, tbl_rev;
- 
- 	data = iwl_acpi_get_object(mvm->dev, ACPI_WRDS_METHOD);
- 	if (IS_ERR(data))
- 		return PTR_ERR(data);
- 
- 	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
--					 ACPI_WRDS_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg)) {
-+					 ACPI_WRDS_WIFI_DATA_SIZE, &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
- 		ret = PTR_ERR(wifi_pkg);
- 		goto out_free;
- 	}
-@@ -719,15 +719,15 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm)
- {
- 	union acpi_object *wifi_pkg, *data;
- 	bool enabled;
--	int i, n_profiles, ret;
-+	int i, n_profiles, ret, tbl_rev;
- 
- 	data = iwl_acpi_get_object(mvm->dev, ACPI_EWRD_METHOD);
- 	if (IS_ERR(data))
- 		return PTR_ERR(data);
- 
- 	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
--					 ACPI_EWRD_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg)) {
-+					 ACPI_EWRD_WIFI_DATA_SIZE, &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
- 		ret = PTR_ERR(wifi_pkg);
- 		goto out_free;
- 	}
-@@ -778,7 +778,7 @@ out_free:
- static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm)
- {
- 	union acpi_object *wifi_pkg, *data;
--	int i, j, ret;
-+	int i, j, ret, tbl_rev;
- 	int idx = 1;
- 
- 	data = iwl_acpi_get_object(mvm->dev, ACPI_WGDS_METHOD);
-@@ -786,12 +786,13 @@ static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm)
- 		return PTR_ERR(data);
- 
- 	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
--					 ACPI_WGDS_WIFI_DATA_SIZE);
--	if (IS_ERR(wifi_pkg)) {
-+					 ACPI_WGDS_WIFI_DATA_SIZE, &tbl_rev);
-+	if (IS_ERR(wifi_pkg) || tbl_rev > 1) {
- 		ret = PTR_ERR(wifi_pkg);
- 		goto out_free;
- 	}
- 
-+	mvm->geo_rev = tbl_rev;
- 	for (i = 0; i < ACPI_NUM_GEO_PROFILES; i++) {
- 		for (j = 0; j < ACPI_GEO_TABLE_SIZE; j++) {
- 			union acpi_object *entry;
-@@ -878,15 +879,29 @@ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)
- {
- 	struct iwl_geo_tx_power_profiles_resp *resp;
- 	int ret;
-+	u16 len;
-+	void *data;
-+	struct iwl_geo_tx_power_profiles_cmd geo_cmd;
-+	struct iwl_geo_tx_power_profiles_cmd_v1 geo_cmd_v1;
-+	struct iwl_host_cmd cmd;
-+
-+	if (fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_SAR_TABLE_VER)) {
-+		geo_cmd.ops =
-+			cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE);
-+		len = sizeof(geo_cmd);
-+		data = &geo_cmd;
-+	} else {
-+		geo_cmd_v1.ops =
-+			cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE);
-+		len = sizeof(geo_cmd_v1);
-+		data = &geo_cmd_v1;
-+	}
- 
--	struct iwl_geo_tx_power_profiles_cmd geo_cmd = {
--		.ops = cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE),
--	};
--	struct iwl_host_cmd cmd = {
-+	cmd = (struct iwl_host_cmd){
- 		.id =  WIDE_ID(PHY_OPS_GROUP, GEO_TX_POWER_LIMIT),
--		.len = { sizeof(geo_cmd), },
-+		.len = { len, },
- 		.flags = CMD_WANT_SKB,
--		.data = { &geo_cmd },
-+		.data = { data },
- 	};
- 
- 	ret = iwl_mvm_send_cmd(mvm, &cmd);
-@@ -956,6 +971,16 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm)
- 					i, j, value[1], value[2], value[0]);
- 		}
- 	}
-+
-+	cmd.table_revision = cpu_to_le32(mvm->geo_rev);
-+
-+	if (!fw_has_api(&mvm->fw->ucode_capa,
-+		       IWL_UCODE_TLV_API_SAR_TABLE_VER)) {
-+		return iwl_mvm_send_cmd_pdu(mvm, cmd_wide_id, 0,
-+				sizeof(struct iwl_geo_tx_power_profiles_cmd_v1),
-+				&cmd);
-+	}
-+
- 	return iwl_mvm_send_cmd_pdu(mvm, cmd_wide_id, 0, sizeof(cmd), &cmd);
- }
- 
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-index 88af1f0ba3f0..ed8fc9a9204c 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-@@ -1184,6 +1184,7 @@ struct iwl_mvm {
- #ifdef CONFIG_ACPI
- 	struct iwl_mvm_sar_profile sar_profiles[ACPI_SAR_PROFILE_NUM];
- 	struct iwl_mvm_geo_profile geo_profiles[ACPI_NUM_GEO_PROFILES];
-+	u32 geo_rev;
- #endif
- };
- 
--- 
-cgit v1.2.1-1-g437b
-
diff --git a/PKGBUILD b/PKGBUILD
index a05aea7..dbcc357 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 
 pkgbase=linux-libre
 _majver=5.2
-_minver=9
+_minver=10
   if [ "$_minver" == "0" ]; then
     pkgver=${_majver}
   else
@@ -21,7 +21,7 @@ _minver=9
   fi
 _gnumajver=${_majver}-gnu
 _gnupkgver=${pkgver}-gnu
-_gccpatchver='20190714'
+_gccpatchver='20190822'
 _srcname=linux-${_majver}
 pkgrel=1
 url='https://linux-libre.fsfla.org/'
@@ -39,7 +39,7 @@ source=(
         0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
         0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
         0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
-        0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
+        0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch
         graysky_bdver2-hotfix.patch
         kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
         ath9k-regdom-hack.patch
@@ -51,17 +51,17 @@ source=(
        )
 sha512sums=('3359b0a10ac04243399a1b0aa84f6c09e3c1914880be19a7e931189da92900ca77e467e7ab5c296a03d2ff0ab3238ec75b13fd41bd2796049b63e71f6896900e'
             'SKIP'
-            'cc1ac3069738e486e4962cd8375b964079ce5d32522a105e10808b05746c4fa8703a1269b28bae9d804dadd16b4378b77ac73840a20b2fd2f302a32fb9ca8b5e'
+            '502d896690509648d836cd448422a8b0d4ea7f57b7faf20c42749716f47c3f1f8e56fd7a0041203aa20509966389f02410cd2563b5bc89ea6b1f5b12facec17b'
             'SKIP'
             '81a57ab537da498800475d1b30d2d067e06325486e7f19aab713c4bab211a7caaf63b85e1c761646eb945c40b6a0b917eeb2be9e58c8a6d9f730e5b25bb982b8'
             '32a95975fd933c2fe25a54b2fd7d6533d7adcc3c7a607159b4625020907af3d632c5b5f457b8c359669dbd19e77bf14348731a5385e10fc94471ad2a1b9a4ceb'
             '45b1928c068ef5304bce127920d504aa0bcf7175b3b29187545a1f0eaaa910e7bd3530ffe12e091da4c5d994c4ac48b4eb5672f72e36fc5719e5a32691c65f72'
-            'fd844c29b492b9c1c1fa7806582a5a396b8846f7d7bd1383951b02ceddbe4e5513d930ccc892cfd7aa2ccbaae0eeeded871aa798a1244b3fbcf76aeb8ef0a2aa'
-            'd5201085f8356f41536dee31b4b1f576b12fb1ed407b138a202ab8f17c29bcc0843cee313e65f9e854daf928612c6db6e8c59433d63a166fc8fdeb335a8fed3a'
-            '8c3c4509c06a4c5f759e2cd63d3271bfe762454c1a99585ef5b1ab6f0202cbd2925ef0beb39bc9f774d840f78837e836060bb96529e850182a4f2bc080308d11'
+            'b39892416a18526230457b50dd0141610d9de3ebf87ab37739367ab70bd9d3240fff2d75955816126ec441f3e0a4718d94ae88e4c7aefacc840f172a6ed02b5e'
+            '1d5d8f6c0afff47deac8ab5f5bd8c0f1633c968bcd1f8022719bd0e3ec8c31b89658f15faaa1decbfb61d88af14fa8eec5886dc21c65e1975362dfd8f3939858'
+            '44b44ef4a7a89c3d57548b41e2152dc5e977a582a8b77dfe7595dd94696890144fa0967cb0fbc4426fff32b616064f3143cf25302cf7af93207b74cb4ac914b6'
             '905beb3f47cccb161e1ee74f8d5ba324b7c2f72e86246d941dfb18c85ace9d32df1966b52d2be2e3ff1ebea74af3b868422aec5a3eebc29858ee9e7207dea226'
             'd6bec327f4f2c69f2fc2780d90cd5d057bc5e32b39e54a13fccb1f5a880a148fa322e54c372e38d3f453d06fd9ab54d653265f355bd61e08a416058bd4224167'
-            'c816c07dec3dd2fc235794b0d680c9c65afda6a7b781036c9dca8b12470d9a378658dbbbe6c6d89ecec47034f5d5b4fcaab987808e4c42b00252ec8a2ede8485'
+            'aec33ac326ff1b64ccd82fb0bf0298aec4ff38c9db618d0ff3a3f6a539a96d72578fff64b6ebb870991dd49eec6dbda7804f781e0cf2126a7c35db0fd6703b79'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf')
@@ -85,7 +85,7 @@ prepare() {
   patch -p1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
   patch -p1 -i ../0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
   patch -p1 -i ../0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
-  patch -p1 -i ../0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
+  patch -p1 -i ../0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch
 
 
   # graysky gcc hotfixes
diff --git a/config.x86_64 b/config.x86_64
index 2e2391b..085940a 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -8374,8 +8374,8 @@ CONFIG_DELL_WMI_DESCRIPTOR=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_SMO8800=m
+CONFIG_DELL_RBTN=m
 # CONFIG_DELL_RBU is not set
-CONFIG_DELL_RBU=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_AMILO_RFKILL=m
@@ -8521,7 +8521,7 @@ CONFIG_IOMMU_SUPPORT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_AMD_IOMMU=y
-CONFIG_AMD_IOMMU_V2=m
+CONFIG_AMD_IOMMU_V2=y
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_SVM=y
diff --git a/graysky_bdver2-hotfix.patch b/graysky_bdver2-hotfix.patch
index 3e2b4f4..a8bb127 100644
--- a/graysky_bdver2-hotfix.patch
+++ b/graysky_bdver2-hotfix.patch
@@ -1,5 +1,5 @@
---- a/kernel_gcc_patch-20190714/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch
-+++ b/kernel_gcc_patch-20190714/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch
+--- a/kernel_gcc_patch-20190822/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch
++++ b/kernel_gcc_patch-20190822/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch
 @@ -492,7 +492,7 @@
  +        cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
  +        cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)