From 886c75718617c8a478395484187d06a6801fc334 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Mon, 25 Sep 2023 13:02:54 +0200 Subject: kernel 6.5.4 --- ...-1ca399f127e0a372537625b1d462ed586f5d9139.patch | 91 ---------------------- 1 file changed, 91 deletions(-) delete mode 100644 SOURCES/0002-Revert-1ca399f127e0a372537625b1d462ed586f5d9139.patch (limited to 'SOURCES/0002-Revert-1ca399f127e0a372537625b1d462ed586f5d9139.patch') diff --git a/SOURCES/0002-Revert-1ca399f127e0a372537625b1d462ed586f5d9139.patch b/SOURCES/0002-Revert-1ca399f127e0a372537625b1d462ed586f5d9139.patch deleted file mode 100644 index 00c9682..0000000 --- a/SOURCES/0002-Revert-1ca399f127e0a372537625b1d462ed586f5d9139.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 046beef43c8c811ce3e96fc2553a15e41f213b11 Mon Sep 17 00:00:00 2001 -From: GloriousEggroll -Date: Wed, 5 Jul 2023 16:01:53 -0600 -Subject: [PATCH 2/3] Revert 1ca399f127e0a372537625b1d462ed586f5d9139 - ---- - .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 51 ++++--------------- - 1 file changed, 10 insertions(+), 41 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 51a3130f6..ae58f24be 100644 ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -358,37 +358,6 @@ static inline bool is_dc_timing_adjust_needed(struct dm_crtc_state *old_state, - } - - /** -- * update_planes_and_stream_adapter() - Send planes to be updated in DC -- * -- * DC has a generic way to update planes and stream via -- * dc_update_planes_and_stream function; however, DM might need some -- * adjustments and preparation before calling it. This function is a wrapper -- * for the dc_update_planes_and_stream that does any required configuration -- * before passing control to DC. -- */ --static inline bool update_planes_and_stream_adapter(struct dc *dc, -- int update_type, -- int planes_count, -- struct dc_stream_state *stream, -- struct dc_stream_update *stream_update, -- struct dc_surface_update *array_of_surface_update) --{ -- reverse_planes_order(array_of_surface_update, planes_count); -- -- /* -- * Previous frame finished and HW is ready for optimization. -- */ -- if (update_type == UPDATE_TYPE_FAST) -- dc_post_update_surfaces_to_stream(dc); -- -- return dc_update_planes_and_stream(dc, -- array_of_surface_update, -- planes_count, -- stream, -- stream_update); --} -- --/** - * dm_pflip_high_irq() - Handle pageflip interrupt - * @interrupt_params: ignored - * -@@ -2725,12 +2694,11 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state, - true; - } - -- update_planes_and_stream_adapter(dm->dc, -- UPDATE_TYPE_FULL, -- dc_state->stream_status->plane_count, -- dc_state->streams[k], -- &bundle->stream_update, -- bundle->surface_updates); -+ dc_update_planes_and_stream(dm->dc, -+ bundle->surface_updates, -+ dc_state->stream_status->plane_count, -+ dc_state->streams[k], -+ &bundle->stream_update); - } - - cleanup: -@@ -8215,12 +8183,11 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, - acrtc_state->stream->link->psr_settings.psr_allow_active) - amdgpu_dm_psr_disable(acrtc_state->stream); - -- update_planes_and_stream_adapter(dm->dc, -- acrtc_state->update_type, -- planes_count, -- acrtc_state->stream, -- &bundle->stream_update, -- bundle->surface_updates); -+ dc_update_planes_and_stream(dm->dc, -+ bundle->surface_updates, -+ planes_count, -+ acrtc_state->stream, -+ &bundle->stream_update); - - /** - * Enable or disable the interrupts on the backend. - --- -2.41.0 - -- cgit v1.2.3