diff --git a/patches.kernel.org/6.3.3-245-drm-amd-display-Fix-hang-when-skipping-modeset.patch b/patches.kernel.org/6.3.3-245-drm-amd-display-Fix-hang-when-skipping-modeset.patch
new file mode 100644
index 0000000..a3c40f1
--- /dev/null
+++ b/patches.kernel.org/6.3.3-245-drm-amd-display-Fix-hang-when-skipping-modeset.patch
@@ -0,0 +1,68 @@
+From: Aurabindo Pillai <aurabindo.pillai@amd.com>
+Date: Fri, 24 Mar 2023 10:42:37 -0400
+Subject: [PATCH] drm/amd/display: Fix hang when skipping modeset
+References: bsc#1012628
+Patch-mainline: 6.3.3
+Git-commit: da5e14909776edea4462672fb4a3007802d262e7
+
+commit da5e14909776edea4462672fb4a3007802d262e7 upstream.
+
+[Why&How]
+
+When skipping full modeset since the only state change was a front porch
+change, the DC commit sequence requires extra checks to handle non
+existant plane states being asked to be removed from context.
+
+Reviewed-by: Alvin Lee <Alvin.Lee2@amd.com>
+Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
+Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
+Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++++-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+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 cf5f7ec3..f54d670a 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -7957,6 +7957,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
+ 			continue;
+ 
+ 		dc_plane = dm_new_plane_state->dc_state;
++		if (!dc_plane)
++			continue;
+ 
+ 		bundle->surface_updates[planes_count].surface = dc_plane;
+ 		if (new_pcrtc_state->color_mgmt_changed) {
+@@ -9616,8 +9618,9 @@ static int dm_update_plane_state(struct dc *dc,
+ 			return -EINVAL;
+ 		}
+ 
++		if (dm_old_plane_state->dc_state)
++			dc_plane_state_release(dm_old_plane_state->dc_state);
+ 
+-		dc_plane_state_release(dm_old_plane_state->dc_state);
+ 		dm_new_plane_state->dc_state = NULL;
+ 
+ 		*lock_and_validation_needed = true;
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+index d9f2ef24..0ae6dcc4 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+@@ -1707,6 +1707,9 @@ bool dc_remove_plane_from_context(
+ 	struct dc_stream_status *stream_status = NULL;
+ 	struct resource_pool *pool = dc->res_pool;
+ 
++	if (!plane_state)
++		return true;
++
+ 	for (i = 0; i < context->stream_count; i++)
+ 		if (context->streams[i] == stream) {
+ 			stream_status = &context->stream_status[i];
+-- 
+2.35.3
+
diff --git a/series.conf b/series.conf
index a0559e7..d4ea8cf 100644
--- a/series.conf
+++ b/series.conf
@@ -978,6 +978,7 @@
 	patches.kernel.org/6.3.3-242-spi-fsl-cpm-Use-16-bit-mode-for-large-transfers.patch
 	patches.kernel.org/6.3.3-243-s390-mm-rename-POPULATE_ONE2ONE-to-POPULATE_DIR.patch
 	patches.kernel.org/6.3.3-244-s390-mm-fix-direct-map-accounting.patch
+	patches.kernel.org/6.3.3-245-drm-amd-display-Fix-hang-when-skipping-modeset.patch
 
 	########################################################
 	# Build fixes that apply to the vanilla kernel too.