From a6efb355571842ed065399a241eabe801f388e72 Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Thu, 4 Mar 2021 15:03:51 +0100 Subject: [PATCH] 5.4.102, 5.10.20, 5.11.3 --- PKGBUILD | 10 +- linux-tkg-config/prepare | 6 +- .../5.11/0012-misc-additions.patch | 184 ------------------ 3 files changed, 8 insertions(+), 192 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 423f1a0..2b0c696 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -53,7 +53,7 @@ else fi pkgname=("${pkgbase}" "${pkgbase}-headers") pkgver="${_basekernel}"."${_sub}" -pkgrel=130 +pkgrel=131 pkgdesc='Linux-tkg' arch=('x86_64') # no i686 in here url="http://www.kernel.org/" @@ -96,7 +96,7 @@ case $_basever in 0012-linux-hardened.patch ) sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491' - 'c0ed3d1660220269d42a6bd34fa15c1178e978569a009c81194c981cc9a44e11' + 'b42056a96c21ec90f05ae9c7691c6af190a4a61cca912e3ddc3791775d1ddd8b' 'SKIP' 'be2066dd6133357007e8c7da9d5de3194b13409ebbfba8821db1849588fced1e' '1f4a20d6eaaa0d969af93152a65191492400c6aa838fc1c290b0dd29bb6019d8' @@ -318,7 +318,7 @@ case $_basever in 0012-misc-additions.patch ) sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43' - 'b9214b48dd1ae9dd9a6420469212df209105fe04ce6930d063cb987f283528d3' + '97680df2a1333328bc13ef3a3a0b6bfe3edb479c68d4961f0739e85bd73779f6' 'SKIP' '458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a' 'eb1da1a028a1c967222b5bdac1db2b2c4d8285bafd714892f6fc821c10416341' @@ -380,7 +380,7 @@ case $_basever in 0012-misc-additions.patch ) sha256sums=('04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4' - '7a6d20308aed903a81a67e76e7c6cd294fb7cbb87f887e2168097da865def8ba' + '5d0c5b8636d71789a8c1b702c76d95f8426ac0899ede9aa8925671ef29423023' 'SKIP' 'd8d5d11c80424985642b0eea6ace3256b5a1e5e69d637104523460a5ebdda202' '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898' @@ -400,7 +400,7 @@ case $_basever in 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' '782ffe25924d5ca63d4318f6551d9855d84adb4099e662cd996ae31aa9b7fa90' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104' - '44e58452e6b759bf6b84ed880f53892ddfc404bc28dd9c8cfd2ae221a677a624') + '7fb1104c167edb79ec8fbdcde97940ed0f806aa978bdd14d0c665a1d76d25c24') ;; 512) opt_ver="5.8%2B" diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index 1a30347..5d03900 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -1,11 +1,11 @@ #!/bin/bash -ver54=101 +ver54=102 ver57=19 ver58=18 ver59=16 -ver510=19 -ver511=2 +ver510=20 +ver511=3 ver512=rc1 _tkg_initscript() { diff --git a/linux-tkg-patches/5.11/0012-misc-additions.patch b/linux-tkg-patches/5.11/0012-misc-additions.patch index 9fa1426..2e058a6 100644 --- a/linux-tkg-patches/5.11/0012-misc-additions.patch +++ b/linux-tkg-patches/5.11/0012-misc-additions.patch @@ -131,187 +131,3 @@ index 2c7171e0b0010..85de313ddec29 100644 select CPU_FREQ_GOV_CONSERVATIVE select CPU_FREQ_GOV_PERFORMANCE help - -From efc8278eecfd5e6fa36c5d41e71d038f534fe107 Mon Sep 17 00:00:00 2001 -From: Anson Jacob -Date: Thu, 18 Feb 2021 19:42:57 -0500 -Subject: Revert "drm/amd/display: reuse current context instead of recreating - one" - -This reverts commit 8866a67ab86cc0812e65c04f1ef02bcc41e24d68. - -Reason for revert: This breaks hotplug of HDMI on some systems, -resulting in a blank screen. Caused general hangs on boot/hotplugs. - -Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1487 -Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1492 -Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211649 -Signed-off-by: Anson Jacob -Reviewed-by: Bhawanpreet Lakha -Acked-by: Alex Deucher -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org ---- - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 ++++++++++--------- - drivers/gpu/drm/amd/display/dc/core/dc.c | 27 +++++++---------------- - drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 ++- - 3 files changed, 23 insertions(+), 30 deletions(-) - -diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index 94cd5ddd67ef8..344404c4ac75b 100644 ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -1936,7 +1936,7 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state, - dc_commit_updates_for_stream( - dm->dc, bundle->surface_updates, - dc_state->stream_status->plane_count, -- dc_state->streams[k], &bundle->stream_update); -+ dc_state->streams[k], &bundle->stream_update, dc_state); - } - - cleanup: -@@ -1967,7 +1967,8 @@ static void dm_set_dpms_off(struct dc_link *link) - - stream_update.stream = stream_state; - dc_commit_updates_for_stream(stream_state->ctx->dc, NULL, 0, -- stream_state, &stream_update); -+ stream_state, &stream_update, -+ stream_state->ctx->dc->current_state); - mutex_unlock(&adev->dm.dc_lock); - } - -@@ -7663,7 +7664,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, - struct drm_crtc *pcrtc, - bool wait_for_vblank) - { -- int i; -+ uint32_t i; - uint64_t timestamp_ns; - struct drm_plane *plane; - struct drm_plane_state *old_plane_state, *new_plane_state; -@@ -7704,7 +7705,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, - amdgpu_dm_commit_cursors(state); - - /* update planes when needed */ -- for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) { -+ for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) { - struct drm_crtc *crtc = new_plane_state->crtc; - struct drm_crtc_state *new_crtc_state; - struct drm_framebuffer *fb = new_plane_state->fb; -@@ -7927,7 +7928,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, - bundle->surface_updates, - planes_count, - acrtc_state->stream, -- &bundle->stream_update); -+ &bundle->stream_update, -+ dc_state); - - /** - * Enable or disable the interrupts on the backend. -@@ -8263,13 +8265,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) - struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state); - struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state); - struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc); -- struct dc_surface_update surface_updates[MAX_SURFACES]; -+ struct dc_surface_update dummy_updates[MAX_SURFACES]; - struct dc_stream_update stream_update; - struct dc_info_packet hdr_packet; - struct dc_stream_status *status = NULL; - bool abm_changed, hdr_changed, scaling_changed; - -- memset(&surface_updates, 0, sizeof(surface_updates)); -+ memset(&dummy_updates, 0, sizeof(dummy_updates)); - memset(&stream_update, 0, sizeof(stream_update)); - - if (acrtc) { -@@ -8326,15 +8328,16 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) - * To fix this, DC should permit updating only stream properties. - */ - for (j = 0; j < status->plane_count; j++) -- surface_updates[j].surface = status->plane_states[j]; -+ dummy_updates[j].surface = status->plane_states[0]; - - - mutex_lock(&dm->dc_lock); - dc_commit_updates_for_stream(dm->dc, -- surface_updates, -+ dummy_updates, - status->plane_count, - dm_new_crtc_state->stream, -- &stream_update); -+ &stream_update, -+ dc_state); - mutex_unlock(&dm->dc_lock); - } - -diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c -index c9aede2f783d3..8f8a13c7cf73d 100644 ---- a/drivers/gpu/drm/amd/display/dc/core/dc.c -+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c -@@ -2697,7 +2697,8 @@ void dc_commit_updates_for_stream(struct dc *dc, - struct dc_surface_update *srf_updates, - int surface_count, - struct dc_stream_state *stream, -- struct dc_stream_update *stream_update) -+ struct dc_stream_update *stream_update, -+ struct dc_state *state) - { - const struct dc_stream_status *stream_status; - enum surface_update_type update_type; -@@ -2716,12 +2717,6 @@ void dc_commit_updates_for_stream(struct dc *dc, - - - if (update_type >= UPDATE_TYPE_FULL) { -- struct dc_plane_state *new_planes[MAX_SURFACES]; -- -- memset(new_planes, 0, sizeof(new_planes)); -- -- for (i = 0; i < surface_count; i++) -- new_planes[i] = srf_updates[i].surface; - - /* initialize scratch memory for building context */ - context = dc_create_state(dc); -@@ -2730,21 +2725,15 @@ void dc_commit_updates_for_stream(struct dc *dc, - return; - } - -- dc_resource_state_copy_construct( -- dc->current_state, context); -+ dc_resource_state_copy_construct(state, context); - -- /*remove old surfaces from context */ -- if (!dc_rem_all_planes_for_stream(dc, stream, context)) { -- DC_ERROR("Failed to remove streams for new validate context!\n"); -- return; -- } -+ for (i = 0; i < dc->res_pool->pipe_count; i++) { -+ struct pipe_ctx *new_pipe = &context->res_ctx.pipe_ctx[i]; -+ struct pipe_ctx *old_pipe = &dc->current_state->res_ctx.pipe_ctx[i]; - -- /* add surface to context */ -- if (!dc_add_all_planes_for_stream(dc, stream, new_planes, surface_count, context)) { -- DC_ERROR("Failed to add streams for new validate context!\n"); -- return; -+ if (new_pipe->plane_state && new_pipe->plane_state != old_pipe->plane_state) -+ new_pipe->plane_state->force_full_update = true; - } -- - } - - -diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h -index a4f7ec888c676..80b67b860091e 100644 ---- a/drivers/gpu/drm/amd/display/dc/dc_stream.h -+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h -@@ -294,7 +294,8 @@ void dc_commit_updates_for_stream(struct dc *dc, - struct dc_surface_update *srf_updates, - int surface_count, - struct dc_stream_state *stream, -- struct dc_stream_update *stream_update); -+ struct dc_stream_update *stream_update, -+ struct dc_state *state); - /* - * Log the current stream state. - */ --- -cgit 1.2.3-1.el7