Merge changes I9bda9f3e,Ie27eba65 into msm-3.0

* changes:
  gpu: ion: Add dump of memory map
  gpu: ion: Add lock around debug routine