rv6: rework deblocking as suggested by Peter Ross