diff --git a/drivers/gpu/msm/kgsl_iommu.c b/drivers/gpu/msm/kgsl_iommu.c
index 71619ddcfd6b..f6b4ecff85b5 100644
--- a/drivers/gpu/msm/kgsl_iommu.c
+++ b/drivers/gpu/msm/kgsl_iommu.c
@@ -2493,7 +2493,10 @@ static const char * const kgsl_iommu_clocks[] = {
 	"gcc_gpu_memnoc_gfx",
 	"gcc_gpu_snoc_dvm_gfx",
 	"gpu_cc_ahb",
-	"gpu_cc_hlos1_vote_gpu_smmu_clk",
+	"gpu_cc_cx_gmu",
+	"gpu_cc_hlos1_vote_gpu_smmu",
+	"gpu_cc_hub_aon",
+	"gpu_cc_hub_cx_int",
 };
 
 static struct kgsl_mmu_ops kgsl_iommu_ops;
diff --git a/drivers/gpu/msm/kgsl_iommu.h b/drivers/gpu/msm/kgsl_iommu.h
index 3b068ed2bf63..ab4a2b703453 100644
--- a/drivers/gpu/msm/kgsl_iommu.h
+++ b/drivers/gpu/msm/kgsl_iommu.h
@@ -60,7 +60,7 @@
 #define KGSL_IOMMU_FSR_SS_SHIFT		30
 
 /* Max number of iommu clks per IOMMU unit */
-#define KGSL_IOMMU_MAX_CLKS 5
+#define KGSL_IOMMU_MAX_CLKS 7
 
 /* offset at which a nop command is placed in setstate */
 #define KGSL_IOMMU_SETSTATE_NOP_OFFSET	1024