The deal will end a case in which the rapper claimed the liquor maker "typecast" his DeLeón tequila brand and treated it poorly "because he is Black.”
On Thursday, a judge struck down DeLeón maker Diageo's motions to either dismiss the case or have it resolved privately.
Newly-unsealed details in the rapper/entrepreneur's lawsuit include further allegations of disinvestment in his DeLeon tequila -- decisions he claims were tinged with racism.
The company says the rapper turned a "garden-variety" business dispute into a "sham" by making "inflammatory" claims of racism.
In a strongly-worded lawsuit, Diddy says Diageo treated his DeLeon Tequila as a “Black brand” that could only be sold to "urban" consumers.