Merge "msm: kgsl: Return the correct A3XX GPU ID based on SoC type" into msm-3.0