The chairman of the world's biggest spirits group Diageo has had his contract extended by two years.