From 5691afc709955e6d08588428fb86f5f5eb715f2c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Jan 2021 22:55:05 +0000 Subject: sys-kernel/linux-{image,sources}-redcore-lts : version bump (v5.10.5), allow unpriviledged users to create namespaces, fix https://bugzilla.kernel.org/show_bug.cgi?id=211033 (patch queued for 5.10.6, but why wait) --- ...m-if-pixel-clock-changed-with-link-active.patch | 109 --------------------- .../files/5.10-amd64.config | 4 +- ...-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch | 13 +++ 3 files changed, 15 insertions(+), 111 deletions(-) delete mode 100644 sys-kernel/linux-sources-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch create mode 100644 sys-kernel/linux-sources-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch (limited to 'sys-kernel/linux-sources-redcore-lts/files') diff --git a/sys-kernel/linux-sources-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch b/sys-kernel/linux-sources-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch deleted file mode 100644 index 631e709d..00000000 --- a/sys-kernel/linux-sources-redcore-lts/files/5.10-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 -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 -Cc: Borislav Petkov -Cc: Harry Wentland -Cc: Nicholas Kazlauskas -Cc: Chiawen Huang -Signed-off-by: Rodrigo Siqueira -Signed-off-by: Alex Deucher ---- - .../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/sys-kernel/linux-sources-redcore-lts/files/5.10-amd64.config b/sys-kernel/linux-sources-redcore-lts/files/5.10-amd64.config index 90a1a253..941d6f95 100644 --- a/sys-kernel/linux-sources-redcore-lts/files/5.10-amd64.config +++ b/sys-kernel/linux-sources-redcore-lts/files/5.10-amd64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.4-redcore-lts Kernel Configuration +# Linux/x86 5.10.5-redcore-lts Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Gentoo Hardened 10.2.0-r10 p4) 10.2.0" CONFIG_CC_IS_GCC=y @@ -191,7 +191,7 @@ CONFIG_UTS_NS=y CONFIG_TIME_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y -# CONFIG_USER_NS_UNPRIVILEGED is not set +CONFIG_USER_NS_UNPRIVILEGED=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_CHECKPOINT_RESTORE=y diff --git a/sys-kernel/linux-sources-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch b/sys-kernel/linux-sources-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch new file mode 100644 index 00000000..c1092a74 --- /dev/null +++ b/sys-kernel/linux-sources-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch @@ -0,0 +1,13 @@ +diff -Nur a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 2021-01-06 13:56:56.000000000 +0000 ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 2021-01-06 22:44:20.751987382 +0000 +@@ -2278,8 +2278,7 @@ + + drm_connector_update_edid_property(connector, + aconnector->edid); +- aconnector->num_modes = drm_add_edid_modes(connector, aconnector->edid); +- drm_connector_list_update(connector); ++ drm_add_edid_modes(connector, aconnector->edid); + + if (aconnector->dc_link->aux_mode) + drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux, -- cgit v1.2.3