 Federer went on to compete at the Madrid Masters on the new blue clay surface , where he beat Tomáš Berdych in the final , thus regaining the world No. 2 ranking from Rafael Nadal . In the French Open , Federer made the semifinals before losing to Djokovic . 
