This is a note to let you know that I've just added the patch titled drm/amdgpu: drop CONFIG_DRM_AMD_DC_DCN3_01 from atomfirmware.h to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-amdgpu-drop-config_drm_amd_dc_dcn3_01-from-atomf.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit 0e0594d117ca71ec4d4017b17d20160c871c64c8 Author: Alex Deucher <alexander.deucher@xxxxxxx> Date: Fri Oct 16 11:42:00 2020 -0400 drm/amdgpu: drop CONFIG_DRM_AMD_DC_DCN3_01 from atomfirmware.h [ Upstream commit 15047bd436a763dd2ddf8e1024b4e25af9cc11ee ] Not needed. Reviewed-by: Luben Tuikov <luben.tuikov@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Stable-dep-of: e64e8f7c178e ("drm/amdgpu/atomfirmware: add intergrated info v2.3 table") Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h index 4eb578b1baef1..6139d10f4289d 100644 --- a/drivers/gpu/drm/amd/include/atomfirmware.h +++ b/drivers/gpu/drm/amd/include/atomfirmware.h @@ -1309,9 +1309,6 @@ struct atom_integrated_system_info_v1_12 uint32_t reserved[63]; }; - -#if defined(CONFIG_DRM_AMD_DC_DCN3_01) - struct edp_info_table { uint16_t edp_backlight_pwm_hz; @@ -1367,7 +1364,6 @@ struct atom_integrated_system_info_v2_1 uint32_t reserved7[32]; }; -#endif // system_config enum atom_system_vbiosmisc_def{