diff mbox series

Revert "drm/i915: Force compilation with intel-iommu for CI validation"

Message ID 20220914204339.4063942-1-lucas.demarchi@intel.com (mailing list archive)
State New, archived
Headers show
Series Revert "drm/i915: Force compilation with intel-iommu for CI validation" | expand

Commit Message

Lucas De Marchi Sept. 14, 2022, 8:43 p.m. UTC
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.demarchi@intel.com>
---
 drivers/gpu/drm/i915/Kconfig.debug | 8 --------
 1 file changed, 8 deletions(-)

Comments

Lucas De Marchi Sept. 15, 2022, 5:25 p.m. UTC | #1
On Thu, Sep 15, 2022 at 02:18:19PM +0000, Patchwork wrote:
>== Series Details ==
>
>Series: Revert "drm/i915: Force compilation with intel-iommu for CI validation"
>URL   : https://patchwork.freedesktop.org/series/108576/
>State : failure
>
>== Summary ==
>
>CI Bug Log - changes from CI_DRM_12136_full -> Patchwork_108576v1_full
>====================================================
>
>Summary
>-------
>
>  **FAILURE**
>
>  Serious unknown changes coming with Patchwork_108576v1_full absolutely need to be
>  verified manually.
>
>  If you think the reported changes have nothing to do with the changes
>  introduced in Patchwork_108576v1_full, please notify your bug team to allow them
>  to document this new failure mode, which will reduce false positives in CI.
>
>
>
>Participating hosts (10 -> 11)
>------------------------------
>
>  Additional (1): shard-rkl
>
>Possible new issues
>-------------------
>
>  Here are the unknown changes that may have been introduced in Patchwork_108576v1_full:
>
>### IGT changes ###
>
>#### Possible regressions ####
>
>  * igt@kms_cursor_crc@cursor-suspend@pipe-d-edp-1:
>    - shard-tglb:         [PASS][1] -> [INCOMPLETE][2]
>   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12136/shard-tglb8/igt@kms_cursor_crc@cursor-suspend@pipe-d-edp-1.html
>   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108576v1/shard-tglb1/igt@kms_cursor_crc@cursor-suspend@pipe-d-edp-1.html

Unrelated. In both cases iommu was disabled. It's not coming from the
compilation options though:

$ curl https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12136/kconfig.txt > /tmp/old.txt
$ curl https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108576v1/kconfig.txt > /tmp/new.txt

$ git diff --no-index /tmp/old.txt /tmp/new.txt
diff --git a/tmp/old.txt b/tmp/new.txt
index 5ed7667..45a8983 100644
--- a/tmp/old.txt
+++ b/tmp/new.txt
@@ -28,7 +28,7 @@ CONFIG_BROKEN_ON_SMP=y
  CONFIG_INIT_ENV_ARG_LIMIT=32
  # CONFIG_COMPILE_TEST is not set
  # CONFIG_WERROR is not set
-CONFIG_LOCALVERSION="-CI_DRM_12136-g37b0cd34584f"
+CONFIG_LOCALVERSION="-Patchwork_108576v1-g37b0cd34584f"
  # CONFIG_LOCALVERSION_AUTO is not set
  CONFIG_BUILD_SALT=""
  CONFIG_HAVE_KERNEL_GZIP=y

Applying with ack by Petri.

Lucas De Marchi
diff mbox series

Patch

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