Commit cca08469 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Use per device iommu check 



With both integrated and discrete Intel GPUs in a system, the current
global check of intel_iommu_gfx_mapped, as done from intel_vtd_active()
may not be completely accurate.

In this patch we add i915 parameter to intel_vtd_active() in order to
prepare it for multiple GPUs and we also change the check away from Intel
specific intel_iommu_gfx_mapped (global exported by the Intel IOMMU
driver) to probing the presence of IOMMU on a specific device using
device_iommu_mapped().

This will return true both for IOMMU pass-through and address translation
modes which matches the current behaviour. If in the future we wanted to
distinguish between these two modes we could either use
iommu_get_domain_for_dev() and check for __IOMMU_DOMAIN_PAGING bit
indicating address translation, or ask for a new API to be exported from
the IOMMU core code.

v2:
  * Check for dmar translation specifically, not just iommu domain. (Baolu)

v3:
 * Go back to plain "any domain" check for now, rewrite commit message.

v4:
 * Use device_iommu_mapped. (Robin, Baolu)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211126141424.493753-1-tvrtko.ursulin@linux.intel.com
parent 44505168

drivers/gpu/drm/i915/display/intel_bw.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, 
	for_each_pipe(dev_priv, pipe)

		data_rate += bw_state->data_rate[pipe];



	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active())

	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))

		data_rate = data_rate * 105 / 100;



	return data_rate;

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -1919,7 +1919,7 @@ static bool needs_async_flip_vtd_wa(const struct intel_crtc_state *crtc_state) 
{

	struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);



	return crtc_state->uapi.async_flip && intel_vtd_active() &&

	return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&

		(DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));

}

drivers/gpu/drm/i915/display/intel_fbc.c

+1 −1
Original line number Diff line number Diff line
@@ -1539,7 +1539,7 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *dev_priv) 
static bool need_fbc_vtd_wa(struct drm_i915_private *dev_priv)

{

	/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */

	if (intel_vtd_active() &&

	if (intel_vtd_active(dev_priv) &&

	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))) {

		drm_info(&dev_priv->drm,

			 "Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");

drivers/gpu/drm/i915/gem/i915_gem_stolen.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem) 
		return 0;

	}



	if (intel_vtd_active() && GRAPHICS_VER(i915) < 8) {

	if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {

		drm_notice(&i915->drm,

			   "%s, disabling use of stolen memory\n",

			   "DMAR active");

drivers/gpu/drm/i915/gem/i915_gemfs.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int i915_gemfs_init(struct drm_i915_private *i915) 
	 */



	opts = NULL;

	if (intel_vtd_active()) {

	if (intel_vtd_active(i915)) {

		if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {

			opts = huge_opt;

			drm_info(&i915->drm,