diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0002-Revert-drm-amd-display-reuse-current-context-instead.patch | 181 | ||||
| -rw-r--r-- | 0003-drm-amdgpu-fix-shutdown-with-s0ix.patch | 77 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
4 files changed, 11 insertions, 277 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-rc - pkgver = 5.11.2rc1 + pkgver = 5.11.3rc1 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -12,24 +12,20 @@ pkgbase = linux-rc makedepends = tar makedepends = xz options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.11.2-rc1.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.11.2-rc1.sign - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.1.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.1.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.11.3-rc1.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.11.3-rc1.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.2.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.2.tar.sign source = config source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - source = 0002-Revert-drm-amd-display-reuse-current-context-instead.patch - source = 0003-drm-amdgpu-fix-shutdown-with-s0ix.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - b2sums = 65807ff9b09c818188deafcfba3a48c9275e9681b920364f2cd4c63d616611ce0533ea3a2e4a1f40afd9d601e173ff3f2e2747ad6f9eae0379a1a6a95a3cc72e + b2sums = 1938fd59c78243c3487a0b9f8acf748497a5605f91d0247b8a83a227751f68f69dcb0fad1db56ec0c6c610cac89f67e0bf39bc0bb95f37dcc9da009f1f37c9e5 b2sums = SKIP - b2sums = a585aa07b5e577bddc8c54086900be6ef768ee71687bcafdb770eef40a3c5aa24ce40ca49d4231645ce3fa2787f8527f68cd5c9fb1f0947c511c759cba957471 + b2sums = 62f47c769998fa713cda9024a4ecbe7ba2140acde629082630c2c0b076b4e941b0a1e82f7d2b7cd4ed6e84759ea93de78e212ecbe1341d9055091d26d83286dc b2sums = SKIP b2sums = e5702f27217c2d23d007fe8c32ec8df39e738acf39c60b2b3d597e2e9d98ca287896646043d4fa35d95c6b8fa115c03a1413ff7c1d76458f99b21b262d7b6f2e b2sums = eab8a07469cff83526e5fef59d72d9c2c539432c161298cb61a09c25d55528e495b4d9dd0ff527d3e5900b8adb3f973f6601ea35837f04bf0c2794eaf04bc6ad - b2sums = a2fd5b8241da9fbc1e027b65685d496b382f2834948eb50bb8dacad21485a72a63ef56cb9a935a0d99b44424e922e3b40afde226dc26ab1ddfba87c447c7308f - b2sums = eda7eed7972c5688119d28050a0af7fb9f36356ca629bec55e9fdb2666630cac484d3260da29a973bcf0867d6f108a2b5f8daa98a3e02244ea9c4b56c2a53e94 pkgname = linux-rc pkgdesc = The release candidate kernel and modules diff --git a/0002-Revert-drm-amd-display-reuse-current-context-instead.patch b/0002-Revert-drm-amd-display-reuse-current-context-instead.patch deleted file mode 100644 index b59338be376f..000000000000 --- a/0002-Revert-drm-amd-display-reuse-current-context-instead.patch +++ /dev/null @@ -1,181 +0,0 @@ -From d7bab9454d82f65ece35819015ffc85b485b6025 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Tue, 9 Feb 2021 17:21:58 -0500 -Subject: [PATCH 3/5] Revert "drm/amd/display: reuse current context instead of - recreating one" - -This reverts commit 8866a67ab86cc0812e65c04f1ef02bcc41e24d68. - -This breaks hotplug of HDMI on some systems, resulting in -a blank screen also causes failures for displays to light up -on other systems. - -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: Alex Deucher <alexander.deucher@amd.com> ---- - .../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 961abf1cf040..e438baa1adc1 100644 ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -1934,7 +1934,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: -@@ -1965,7 +1965,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); - } - -@@ -7548,7 +7549,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; -@@ -7589,7 +7590,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; -@@ -7812,7 +7813,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. -@@ -8148,13 +8150,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) { -@@ -8211,15 +8213,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 6cf1a5a2a5ec..58eb0d69873a 100644 ---- a/drivers/gpu/drm/amd/display/dc/core/dc.c -+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c -@@ -2679,7 +2679,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; -@@ -2698,12 +2699,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); -@@ -2712,21 +2707,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 e243c01b9672..b7910976b81a 100644 ---- a/drivers/gpu/drm/amd/display/dc/dc_stream.h -+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h -@@ -283,7 +283,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. - */ --- -2.30.1 - diff --git a/0003-drm-amdgpu-fix-shutdown-with-s0ix.patch b/0003-drm-amdgpu-fix-shutdown-with-s0ix.patch deleted file mode 100644 index b1284e51e2e4..000000000000 --- a/0003-drm-amdgpu-fix-shutdown-with-s0ix.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 2f9e39653193621bac38a1ef3da56796d5921474 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Thu, 18 Feb 2021 12:05:53 -0500 -Subject: [PATCH 4/5] drm/amdgpu: fix shutdown with s0ix - -For shutdown needs to be handled differently and s0ix. Add -a new flag to shutdown and use it to adjust behavior appropriately. - -Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1499 -Fixes: 628c36d7b238e2 ("drm/amdgpu: update amdgpu device suspend/resume sequence for s0i3 support") -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> -Cc: Prike Liang <Prike.Liang@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++-- - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 ++ - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index 5993dd0fdd8e..4ae244048d53 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -1002,6 +1002,7 @@ struct amdgpu_device { - /* s3/s4 mask */ - bool in_suspend; - bool in_hibernate; -+ bool in_shutdown; - - atomic_t in_gpu_reset; - enum pp_mp1_state mp1_state; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -index cab1ebaf6d62..d07ff05ad042 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -2666,7 +2666,8 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev) - { - int i, r; - -- if (!amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) { -+ if (adev->in_shutdown || -+ !amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) { - amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE); - amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE); - } -@@ -3726,7 +3727,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) - - amdgpu_fence_driver_suspend(adev); - -- if (!amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) -+ if (adev->in_shutdown || -+ !amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) - r = amdgpu_device_ip_suspend_phase2(adev); - else - amdgpu_gfx_state_change_set(adev, sGpuChangeState_D3Entry); -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -index 7169fb5e3d9c..2aacb96cf320 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -1259,6 +1259,7 @@ amdgpu_pci_shutdown(struct pci_dev *pdev) - if (amdgpu_ras_intr_triggered()) - return; - -+ adev->in_shutdown = true; - /* if we are running in a VM, make sure the device - * torn down properly on reboot/shutdown. - * unfortunately we can't detect certain -@@ -1268,6 +1269,7 @@ amdgpu_pci_shutdown(struct pci_dev *pdev) - adev->mp1_state = PP_MP1_STATE_UNLOAD; - amdgpu_device_ip_suspend(adev); - adev->mp1_state = PP_MP1_STATE_NONE; -+ adev->in_shutdown = false; - } - - static int amdgpu_pmops_suspend(struct device *dev) --- -2.30.1 - @@ -7,7 +7,7 @@ _srcname=linux-5.11 _major=5.11 ### on initial release this is null otherwise it is the current stable subversion ### ie 1,2,3 corresponding $_major.1, $_major.3 etc -_minor=1 +_minor=2 _minorc=$((_minor+1)) ### on initial release this is just $_major _fullver=$_major.$_minor @@ -30,21 +30,17 @@ source=( https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_fullver.tar.{xz,sign} config # the main kernel config file 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-Revert-drm-amd-display-reuse-current-context-instead.patch - 0003-drm-amdgpu-fix-shutdown-with-s0ix.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -b2sums=('65807ff9b09c818188deafcfba3a48c9275e9681b920364f2cd4c63d616611ce0533ea3a2e4a1f40afd9d601e173ff3f2e2747ad6f9eae0379a1a6a95a3cc72e' +b2sums=('1938fd59c78243c3487a0b9f8acf748497a5605f91d0247b8a83a227751f68f69dcb0fad1db56ec0c6c610cac89f67e0bf39bc0bb95f37dcc9da009f1f37c9e5' 'SKIP' - 'a585aa07b5e577bddc8c54086900be6ef768ee71687bcafdb770eef40a3c5aa24ce40ca49d4231645ce3fa2787f8527f68cd5c9fb1f0947c511c759cba957471' + '62f47c769998fa713cda9024a4ecbe7ba2140acde629082630c2c0b076b4e941b0a1e82f7d2b7cd4ed6e84759ea93de78e212ecbe1341d9055091d26d83286dc' 'SKIP' 'e5702f27217c2d23d007fe8c32ec8df39e738acf39c60b2b3d597e2e9d98ca287896646043d4fa35d95c6b8fa115c03a1413ff7c1d76458f99b21b262d7b6f2e' - 'eab8a07469cff83526e5fef59d72d9c2c539432c161298cb61a09c25d55528e495b4d9dd0ff527d3e5900b8adb3f973f6601ea35837f04bf0c2794eaf04bc6ad' - 'a2fd5b8241da9fbc1e027b65685d496b382f2834948eb50bb8dacad21485a72a63ef56cb9a935a0d99b44424e922e3b40afde226dc26ab1ddfba87c447c7308f' - 'eda7eed7972c5688119d28050a0af7fb9f36356ca629bec55e9fdb2666630cac484d3260da29a973bcf0867d6f108a2b5f8daa98a3e02244ea9c4b56c2a53e94') + 'eab8a07469cff83526e5fef59d72d9c2c539432c161298cb61a09c25d55528e495b4d9dd0ff527d3e5900b8adb3f973f6601ea35837f04bf0c2794eaf04bc6ad') export KBUILD_BUILD_HOST=archlinux |