5.4.87, 5.10.5

PKGBUILD

@@ -48,7 +48,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=108
+pkgrel=109
 pkgdesc='Linux-tkg'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
@@ -91,7 +91,7 @@ case $_basever in
         	0012-linux-hardened.patch
 	)
 	sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
-            '203ac7aee6f196f8a3ae5e98b214baf79d0d7924477cf3b262b6bb6658d68f05'
+            'cb107fecf0606a87f46694f0afbb80011190b47cd99c9063d98284012811bb83'
             'SKIP'
             '55dd5117c1da17c9ec38d7bc995958958bcc8b7ebcfd81de1d4c7650b85537ab'
             '1f4a20d6eaaa0d969af93152a65191492400c6aa838fc1c290b0dd29bb6019d8'
@@ -318,7 +318,7 @@ case $_basever in
         0012-misc-additions.patch
     )
     sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
-            '0089cea5866978effd79567fdfdffe0ae950747f32a56e5f00b98d38e686f5b1'
+            '20a9a6742728677d0959197bc00cb9963ecffc6164d0e082364c11b9c9961349'
             'SKIP'
             '458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a'
             '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
@@ -340,7 +340,7 @@ case $_basever in
             'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
             'e308292fc42840a2366280ea7cf26314e92b931bb11f04ad4830276fc0326ee1'
             '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
-            '5a1f6a5b9742df0652880a2812f789b24bb73e84edec9fb4a15dd34df7ea5780')
+            '8a752a93bdb06ad1dd7607cf4c5071b59396f1935e1e597715375826a1c541e8')
 	;;
 	511)
 	opt_ver="5.8%2B"

linux-tkg-config/prepare

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-ver54=86
+ver54=87
 ver57=19
 ver58=18
 ver59=16
-ver510=4
+ver510=5
 ver511=rc2
 
 _tkg_initscript() {

linux-tkg-patches/5.10/0012-misc-additions.patch

@@ -137,117 +137,6 @@ index bf7ecab5d9e5..142e9dae2837 100644
 -- 
 cgit v1.2.3-1-gf6bb5
 
-From 88fbde26128dedf0097aa45b8c923973a4e5f843 Mon Sep 17 00:00:00 2001
-From: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-Date: Tue, 15 Dec 2020 10:33:34 -0500
-Subject: 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>
-Reported-and-tested-by: Borislav Petkov <bp@suse.de>
-Acked-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
----
- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c  | 44 +++++++++++++++++++++-
- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h  |  2 +
- 2 files changed, 44 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..56bc401536c5 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,44 @@ 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
-+		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 +1704,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);
--- 
-cgit v1.2.3-1-gf6bb5
-
 From 0128c7314a4d856461caacfdd528a7bffa03d41e Mon Sep 17 00:00:00 2001
 From: Josef Bacik <josef@toxicpanda.com>
 Date: Wed, 23 Dec 2020 14:41:00 -0500