hdmi: clean up a little
HDMI: improve multichannel support