1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index a814c95f73ce..a320bda2c305 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3415,9 +3415,12 @@ static int __init init_dmars(void)
                 iommu_identity_mapping |= IDENTMAP_ALL;
 
 #ifdef CONFIG_INTEL_IOMMU_BROKEN_GFX_WA
-        iommu_identity_mapping |= IDENTMAP_GFX;
+        dmar_map_gfx = 0;
 #endif
 
+        if (!dmar_map_gfx)
+                iommu_identity_mapping |= IDENTMAP_GFX;
+
         check_tylersburg_isoch();
 
         if (iommu_identity_mapping) {