1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index de47bdb57e48..a814c95f73ce 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -4053,9 +4053,7 @@ static void __init init_no_remapping_devices(void)
 
                 /* This IOMMU has *only* gfx devices. Either bypass it or
                    set the gfx_mapped flag, as appropriate */
-                if (dmar_map_gfx) {
-                        intel_iommu_gfx_mapped = 1;
-                } else {
+                if (!dmar_map_gfx) {
                         drhd->ignored = 1;
                         for_each_active_dev_scope(drhd->devices,
                                                   drhd->devices_cnt, i, dev)
@@ -4894,6 +4892,9 @@ int __init intel_iommu_init(void)
                 goto out_free_reserved_range;
         }
 
+        if (dmar_map_gfx)
+                intel_iommu_gfx_mapped = 1;
+
         init_no_remapping_devices();
 
         ret = init_dmars();