Revert "gpu: ion: Refactor locking"

This reverts commit 675a52aa0d89e8b6c0c05849627381d8a64b2b2b.