Commit bab31a22 authored by David Woodhouse's avatar David Woodhouse Committed by Keith Packard
Browse files

intel-iommu: Export a flag indicating that the IOMMU is used for iGFX. 



We really don't want this to work in the general case; device drivers
*shouldn't* care whether they are behind an IOMMU or not. But the
integrated graphics is a special case, because the IOMMU and the GTT are
all kind of smashed into one and generally horrifically buggy, so it's
reasonable for the graphics driver to want to know when the IOMMU is
active for the graphics hardware.

Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent d15bf23b

drivers/iommu/intel-iommu.c

+15 −10
Original line number Original line Diff line number Diff line
@@ -404,6 +404,9 @@ static int dmar_forcedac; 
static int intel_iommu_strict;

static int intel_iommu_strict;

static int intel_iommu_superpage = 1;

static int intel_iommu_superpage = 1;





int intel_iommu_gfx_mapped;

EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);



#define DUMMY_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-1))

#define DUMMY_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-1))

static DEFINE_SPINLOCK(device_domain_lock);

static DEFINE_SPINLOCK(device_domain_lock);

static LIST_HEAD(device_domain_list);

static LIST_HEAD(device_domain_list);
@@ -3226,9 +3229,6 @@ static void __init init_no_remapping_devices(void) 
		}

		}

	}

	}





	if (dmar_map_gfx)

		return;



	for_each_drhd_unit(drhd) {

	for_each_drhd_unit(drhd) {

		int i;

		int i;

		if (drhd->ignored || drhd->include_all)

		if (drhd->ignored || drhd->include_all)
@@ -3242,7 +3242,11 @@ static void __init init_no_remapping_devices(void) 
		if (i < drhd->devices_cnt)

		if (i < drhd->devices_cnt)

			continue;

			continue;





		/* bypass IOMMU if it is just for gfx devices */

		/* 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 {

			drhd->ignored = 1;

			drhd->ignored = 1;

			for (i = 0; i < drhd->devices_cnt; i++) {

			for (i = 0; i < drhd->devices_cnt; i++) {

				if (!drhd->devices[i])

				if (!drhd->devices[i])
@@ -3251,6 +3255,7 @@ static void __init init_no_remapping_devices(void) 
			}

			}

		}

		}

	}

	}

}





#ifdef CONFIG_SUSPEND

#ifdef CONFIG_SUSPEND

static int init_iommu_hw(void)

static int init_iommu_hw(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE