Luis Suarez has agreed a new deal that could see him remain with Barcelona until June 30, 2021, with a huge buyout clause of €200m inserted.