That commit is correct. I don't think we should revert it. That said I don't quite understand why it leads to issues. Are you able to take another set of kernel logs from amd-staging-drm-next, both with the regression commit and without, with drm.debug=0x4 set both times?