!UPSTREAM: try to fix 53077

TODO:
- Test on HSW
- Make a piglit test to verify that the blit is working correctly
- Comment better