[Intel-gfx] [PATCH] Revert "HAX iommu/intel: Ignore igfx_off"

[Tvrtko Ursulin]

On 14/09/2022 21:35, Lucas De Marchi wrote:
> This reverts commit 58f44e349cfc10a4f2208fd806829c8fd046480b.
> 
> To be removed from the topic/core-for-CI branch. If CI's config is
> setting that, it just shouldn't do it. Looking at a random current CI
> execution, the command line is:
> 
> Command line: BOOT_IMAGE=/boot/drm_intel root=/dev/nvme0n1p2 \
> 	rootwait fsck.repair=yes nmi_watchdog=panic,auto panic=5 \
> 	softdog.soft_panic=5 drm.debug=0xe log_buf_len=1M trace_clock=global 3 \
> 	modprobe.blacklist=i915,snd_hda_intel ro
> 
> So it should be safe to remove this commit.

It's a patch which can silently bite so no complaints from me to remove 
it - just please upgrade the check from a "random current CI execution" 
to something stronger. Ack from CI folks would do.

Regards,

Tvrtko

> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>   drivers/iommu/intel/iommu.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
> index 598c9b86dfd8..1f2cd43cf9bc 100644
> --- a/drivers/iommu/intel/iommu.c
> +++ b/drivers/iommu/intel/iommu.c
> @@ -323,6 +323,8 @@ static int __init intel_iommu_setup(char *str)
>   			no_platform_optin = 1;
>   			pr_info("IOMMU disabled\n");
>   		} else if (!strncmp(str, "igfx_off", 8)) {
> +			dmar_map_gfx = 0;
> +			pr_info("Disable GFX device mapping\n");
>   		} else if (!strncmp(str, "forcedac", 8)) {
>   			pr_warn("intel_iommu=forcedac deprecated; use iommu.forcedac instead\n");
>   			iommu_dma_forcedac = true;