Merge "Revert "msm_11ad: set geometry attr when SMMU stage1 is enabled""