I've been reconciling the public tree with our internal tree and noticed a few things that I missed along the way. This patch set is intended to reconcile that. Patch 1 was missed when sending out today's set of DC patches. Harry Wentland (5): drm/amd/display: Use int for calculating vline start drm/amd/display: Couple formatting fixes drm/amd/display: Don't force UPDATE_TYPE_FULL if stream_update has hdr_static_metadata drm/amd/display: Add VG12 ASIC IDs drm/amd/display: Add get_firmware_info_v3_2 for VG12 Jerry (Fangzhi) Zuo (1): drm/amd: Add BIOS smu_info v3_3 required struct def. .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- .../drm/amd/display/dc/bios/bios_parser2.c | 86 ++++++++- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 - .../gpu/drm/amd/display/dc/core/dc_resource.c | 6 +- .../amd/display/dc/dce112/dce112_resource.c | 2 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 8 +- .../gpu/drm/amd/display/include/dal_asic_id.h | 9 +- drivers/gpu/drm/amd/include/atomfirmware.h | 170 +++++++++++++++++- 8 files changed, 270 insertions(+), 17 deletions(-) -- 2.17.0