Revert "intel: We don't need to take the bufmgr lock whilst mapping."

This reverts commit 7ca55849.

This was pushed ahead of an essential review of bo level locking in
mesa, without which we cannot know whether removing this lock is safe.