This reverts commit 9e54866e25e7919ab9704a7680bd8df0c9ee9cdd.
To be removed from topic/core-for-CI branch. If I got the location right
for the CI config
(https://gitlab.freedesktop.org/gfx-ci/i915-infra/-/blob/master/kconfig/debug),
it should be safe to remove this as it already has
CONFIG_INTEL_IOMMU_DEFAULT_ON=y. And if it's somewhere else and my
premise is false, we will know from the CI execution of this patch.
Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
---
drivers/gpu/drm/i915/Kconfig.debug | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/Kconfig.debug
b/drivers/gpu/drm/i915/Kconfig.debug
index e7fd3e76f8a2..93dfb7ed9705 100644
--- a/drivers/gpu/drm/i915/Kconfig.debug
+++ b/drivers/gpu/drm/i915/Kconfig.debug
@@ -21,14 +21,6 @@ config DRM_I915_DEBUG
depends on DRM_I915
depends on EXPERT # only for developers
depends on !COMPILE_TEST # never built by robots
- select PCI_MSI # ... for iommu enabled by default
- select IOMMU_API
- select IOMMU_IOVA
- select IOMMU_SUPPORT
- select NEED_DMA_MAP_STATE
- select DMAR_TABLE
- select INTEL_IOMMU
- select INTEL_IOMMU_DEFAULT_ON
select DEBUG_FS
select PREEMPT_COUNT
select I2C_CHARDEV
--
2.37.3
