A bad merge of 1abaa75bae9e ("drm/amd/display: Fix for otg synchronization logic") caused Linus to see a lot of underflow on his two 4k displays. This set pulls his revert and fixes up the original patch. Linus Torvalds (1): Revert "drm/amd/display: Fix for otg synchronization logic" Meenakshikumar Somasundaram (1): drm/amd/display: Fix for otg synchronization logic drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +++++++++++---- drivers/gpu/drm/amd/display/dc/inc/resource.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) -- 2.34.1