Marie Gottshalk argues in Caught argues that while the war on drugs is a non-negligible part, we can’t overlook sexual offenses.

“You mention another big engine of the carceral state build-up is the war on sex offenders. In Caught, you note that from 1996 to 2010 the number of people serving time at the federal level for drug convictions went up 80 percent, but those serving time for sexually explicit materials went up sixtyfold.”

https://www.jacobinmag.com/2015/03/mass-incarceration-war-on-drugs

Which suggests that even we get our heads right about how to address drugs, the system of racial and social control will find another means.