diff options
Diffstat (limited to 'SOURCES/tkg-misc-additions.patch')
-rw-r--r-- | SOURCES/tkg-misc-additions.patch | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/SOURCES/tkg-misc-additions.patch b/SOURCES/tkg-misc-additions.patch index 938ddf3..3056a1c 100644 --- a/SOURCES/tkg-misc-additions.patch +++ b/SOURCES/tkg-misc-additions.patch @@ -98,19 +98,6 @@ index f4b210ab061291..837d0dbb28ea08 100644 help This value can be used to select the number of bits to use to -diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_state.c b/drivers/gpu/drm/amd/display/dc/core/dc_state.c -index 180ac47868c2..42bf097b36b7 100644 ---- a/drivers/gpu/drm/amd/display/dc/core/dc_state.c -+++ b/drivers/gpu/drm/amd/display/dc/core/dc_state.c -@@ -300,7 +300,6 @@ void dc_state_destruct(struct dc_state *state) - state->phantom_plane_count = 0; - - state->stream_mask = 0; -- memset(&state->res_ctx, 0, sizeof(state->res_ctx)); - memset(&state->pp_display_cfg, 0, sizeof(state->pp_display_cfg)); - memset(&state->dcn_bw_vars, 0, sizeof(state->dcn_bw_vars)); - state->clk_mgr = NULL; - From 299b81f3e619aea3ceda77d7c42842a496b34a53 Mon Sep 17 00:00:00 2001 From: Peter Jung <admin@ptr1337.dev> Date: Thu, 21 Mar 2024 19:00:50 +0100 @@ -151,9 +138,9 @@ index 59d2eee72a3297..0a4e75de95c257 100644 -#ifdef AMD_PRIVATE_COLOR +#ifdef CONFIG_AMD_PRIVATE_COLOR - if (amdgpu_dm_create_color_properties(adev)) - return -ENOMEM; - #endif + if (amdgpu_dm_create_color_properties(adev)) { + dc_state_release(state->context); + kfree(state); diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c index c87b64e464ed5c..6fe07243adc3d5 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c |