Can you try passing this on your kernel command line (with the bad commit): "video=HDMI-A-2:d"? This will force HDMI-A-2 to report disconnected. I wonder if that helps.