Update to 5.11.3

3 files changed, 2 insertions, 266 deletions

diff --git a/0002-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch b/0002-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch
deleted file mode 100644
index a9b880d..0000000
--- a/0002-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 15de5c46af8af7e21c34a9a1e1027ff4d7fdd93f Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Tue, 9 Feb 2021 17:21:58 -0500
-Subject: 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>
----
- 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 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.
-  */
--- 
-cgit v1.2.3-1-gf6bb5
-
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 0427bc0..0000000
--- a/0003-drm-amdgpu-fix-shutdown-with-s0ix.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 7e63b4196ca6366bbc43741f340b33988c660c33 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Thu, 18 Feb 2021 12:05:53 -0500
-Subject: 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)
--- 
-cgit v1.2.3-1-gf6bb5
-
diff --git a/PKGBUILD b/PKGBUILD
index 96dd78b..5dd727d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@ _custom=1
 pkgbase=linux-ck
 _supver=5
 _majver=11
-_minver=2
+_minver=3
 _gccpatchver='20201113'
 _gccpatchger='10.1'
 _gccpatchker='5.8'
@@ -51,8 +51,6 @@ source=(
   config         # the main kernel config file
   linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}.xz::http://ck.kolivas.org/patches/${_supver}.0/${_supver}.${_majver}/${_supver}.${_majver}-${_ckpatchversion}/patch-${_supver}.${_majver}-${_ckpatchversion}.xz
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  0002-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch
-  0003-drm-amdgpu-fix-shutdown-with-s0ix.patch
   kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
   ath9k-regdom-hack.patch
   raid6-default-algo.patch
@@ -62,13 +60,11 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-b2sums=('62f47c769998fa713cda9024a4ecbe7ba2140acde629082630c2c0b076b4e941b0a1e82f7d2b7cd4ed6e84759ea93de78e212ecbe1341d9055091d26d83286dc'
+b2sums=('9451bda48221ea58096682a4ce107194580a6fcaccb15d62b881c2ba8eddadbd46b010b20e2fa8e723674de0d29dd0a12749c9245db39b521659bc6cf2f270c5'
         'SKIP'
         '926ec7985fea53a4b95485dd43acc7bb6ac3d5084e47a7866c4c83f8dcab22e73dd7d1ea8a08d13cffa56dc196768e0de3b9153090ffe801d9b6afd13b8ed6ab'
         '81d948aef4423255ebb4fa9b12c96207af8d14e225cf95d631dfbb1c0e88d31f60f81c2aff63046a78d8daf2601270ebb1d9cfaeccc3e3fdb08dbc430b53aff5'
         '2f9195675270d79d735a3aaec25887c2f80b76eae98be8fcc5fd59ab71d925c5ee20ec5e2a015deb68b61bc2cc7f56f546a22cb96ee038e2e24c2c9dd5c3f79f'
-        '1e3a9aadc3e944afd9601457f69218fd4cf61badabed6924622bce3273c2a95602fc6aab00c1399767f5115d3fbecde391b553acc259c817f8d6b29a18b1f8ad'
-        'a5c4d1bf3b15e3ee2491f75485627ebf1a9f6759f38798c08fcd09bf90b40fed997d7f14190809f4e676907f8a1c9150e3de2da856c8b92e022d3250a86040fe'
         '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127'
         'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a'
         'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a')
@@ -90,8 +86,6 @@ prepare() {
   # Hotfixes
   echo "Applying hotfixes"
   patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  patch -p1 -i ../0002-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch
-  patch -p1 -i ../0003-drm-amdgpu-fix-shutdown-with-s0ix.patch
 
 
   # ck patch