From patchwork Wed Sep 14 20:43:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 12976537 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 027C3C6FA82 for ; Wed, 14 Sep 2022 20:44:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B8B410EA05; Wed, 14 Sep 2022 20:44:13 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id BEF8C10E9FD for ; Wed, 14 Sep 2022 20:44:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663188248; x=1694724248; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dInC9xiA/y4FKSYGl2EbjYL8MYd0vjVRMTfFJUnT0WE=; b=TcQsLGaAWqLwN33HhpyhFg4gw+5kn5ki1nD5qw5bGFtBA4sfun3FSOZT 9yyGmg4hOSadys0xD3yL3Fr69vcaUlBEUn5BDJ76HvVP3USRm69py146w 0Rulbz0GfS6pU+l+6Lx0fL4v9yjNxWRBKxGU4w63Oxb4cjjQQ37aN6frJ rWv3vPQRbwupwp7o9Q2EOvLcfoWhXtuCJhhK8UZZ9it2IZ2VG+Ma3QZvx 9eH0xXeuVyp0bn+cefo5x2vdh5drSd2is+RsGXrsj5lpsQS4GHGCF4ha5 KyuIbcXzIa3oLP7xaHlsZEPyN7OJK7Tr8Xx+0je7POhv3enIe4437LViK g==; X-IronPort-AV: E=McAfee;i="6500,9779,10470"; a="299350196" X-IronPort-AV: E=Sophos;i="5.93,315,1654585200"; d="scan'208";a="299350196" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2022 13:44:08 -0700 X-IronPort-AV: E=Sophos;i="5.93,315,1654585200"; d="scan'208";a="650211842" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.143]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2022 13:44:08 -0700 From: Lucas De Marchi To: intel-gfx@lists.freedesktop.org Date: Wed, 14 Sep 2022 13:43:39 -0700 Message-Id: <20220914204339.4063942-1-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] Revert "drm/i915: Force compilation with intel-iommu for CI validation" X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lucas De Marchi , Rodrigo Vivi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 --- 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