From patchwork Mon Jan 25 12:26:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12043389 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30777C433E6 for ; Mon, 25 Jan 2021 13:06:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BD3B022583 for ; Mon, 25 Jan 2021 13:06:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD3B022583 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D1166E0A8; Mon, 25 Jan 2021 13:06:18 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id AC94D8997A; Mon, 25 Jan 2021 12:26:55 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 40D462310A; Mon, 25 Jan 2021 12:26:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611577615; bh=A+0Js7aEmvCEqlxCd8cHbZodFFgw/k9Df4K9Dm9wPII=; h=From:To:Cc:Subject:Date:From; b=Ib3D0YrzD1CUR5but9zvYwxIeND0+tWbU7jxbm/1mcLUF54N6XWKhH/QWeLYd14eR 6mm8rR+Ya5w0KhD8rluz6fxb5crom4FcSVUwf5GzyiZy1OCsUzMLR0VUJKlhtPpVCW oTY15YVVMfDLujC/oOVsfC2a16GF+byZOa7nAHdgrs5XGoz2tFMtVi2c5wd1PpH5n3 wmUweYibZ3wHr/+RgSOhQ3dAIRIsLzdC6y60U7SvMyoK94yyaG6nReuGCrobXrmDh8 7M0+XvAPbLrJ1uEOkB4DPubqCwreOPyNmsnpn7euYkWRMRlj2zFmuIdbsX6aUqB5pP 0yd5+fM8vlDzA== From: Arnd Bergmann To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , Mika Kuoppala , Chris Wilson Date: Mon, 25 Jan 2021 13:26:44 +0100 Message-Id: <20210125122650.4178417-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 25 Jan 2021 13:06:17 +0000 Subject: [Intel-gfx] [PATCH] i915: Fix DRM_I915_WERROR dependencies 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: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Arnd Bergmann , linux-kernel@vger.kernel.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Arnd Bergmann CONFIG_DRM_I915_DEBUG now selects CONFIG_DRM_I915_WERROR, but fails to honor its dependencies: WARNING: unmet direct dependencies detected for DRM_I915_WERROR Depends on [n]: HAS_IOMEM [=y] && DRM_I915 [=m] && EXPERT [=y] && !COMPILE_TEST [=y] Selected by [m]: - DRM_I915_DEBUG [=y] && HAS_IOMEM [=y] && EXPERT [=y] && DRM_I915 [=m] Change the 'select' to a conditional one that doesn't trigger -Werror warnings for allmodconfig builds and other compile tests. Fixes: 4f86975f539d ("drm/i915: Add DEBUG_GEM to the recommended CI config") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/i915/Kconfig.debug | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug index be76054c01d8..97793b28d007 100644 --- a/drivers/gpu/drm/i915/Kconfig.debug +++ b/drivers/gpu/drm/i915/Kconfig.debug @@ -31,9 +31,9 @@ config DRM_I915_DEBUG select DRM_DEBUG_SELFTEST select DMABUF_SELFTESTS select SW_SYNC # signaling validation framework (igt/syncobj*) - select DRM_I915_WERROR - select DRM_I915_DEBUG_GEM - select DRM_I915_DEBUG_GEM_ONCE + select DRM_I915_WERROR if !COMPILE_TEST + select DRM_I915_DEBUG_GEM if !COMPILE_TEST + select DRM_I915_DEBUG_GEM_ONCE if !COMPILE_TEST select DRM_I915_DEBUG_MMIO select DRM_I915_DEBUG_RUNTIME_PM select DRM_I915_SW_FENCE_DEBUG_OBJECTS