Merge pull request #9486 from error414/hdzero-displayport-fix