I would tell him upfront first that you don't like it and it has to stop, give him a clear message that it's unacceptable and the chance to remedy his own behaviour before reporting it. He should know better, but some people seriously just don't!
If he continues to bother you after being made aware that you are uncomfortable then I think you have grounds to complain right away.