From patchwork Wed May 10 20:55:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Harrison X-Patchwork-Id: 13237253 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 45B0FC77B7C for ; Wed, 10 May 2023 20:55:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5287810E529; Wed, 10 May 2023 20:55:38 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 53BC210E529; Wed, 10 May 2023 20:55:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683752136; x=1715288136; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=0ALpZ/zkvINnH3Gc0R882xESQdJCMga3ZFewhxI15y4=; b=nt3o8W6G63H2a3lidAG0ZAOUDDXO09pvLORDAQ8+zmx9NKMC3iBQ18QC WTibLpF7Nu/B3FfssGbzQBv2wFwpnvU6k93qfdRt9aIZAaKdNwR+qQYaE nbjR7tVZl/LKQrfJK+Apa8dep+5D5utoM16IADrhSt7noGzWtW1nYCTyX gTj1nBEBrvKXY7Yfl7JLImQnuh8k6Y6T1f/ecFRl5HLzFefEXH9PNX4Hk 4HiZl2myFM7iO53tJUJZyldpIuLci3VFnGP0gegV+xUjiFrYtY0qao5ED PAWgpt8bLdpPNT+Wfg4W9Yuk5n4XS+A/kM2MKbyg9EAO5fKj13V8eBBIn w==; X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="347783868" X-IronPort-AV: E=Sophos;i="5.99,265,1677571200"; d="scan'208";a="347783868" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 13:55:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="1029370905" X-IronPort-AV: E=Sophos;i="5.99,265,1677571200"; d="scan'208";a="1029370905" Received: from relo-linux-5.jf.intel.com ([10.165.21.152]) by fmsmga005.fm.intel.com with ESMTP; 10 May 2023 13:55:34 -0700 From: John.C.Harrison@Intel.com To: Intel-GFX@Lists.FreeDesktop.Org Subject: [PATCH] drm/i1915/guc: Fix probe injection CI failures after recent change Date: Wed, 10 May 2023 13:55:56 -0700 Message-Id: <20230510205556.312999-1-John.C.Harrison@Intel.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alan Previn , Jani Nikula , Lucas De Marchi , DRI-Devel@Lists.FreeDesktop.Org, Daniele Ceraolo Spurio , Rodrigo Vivi , John Harrison Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: John Harrison A recent change bumped a 'notice' message up to 'error' level for debug builds to help trap incorrect configurations in CI systems. Unfortunaetly, tha error condition in question is triggered by the error injection probe test. So change the message again to be 'probe error' level instead. Signed-off-by: John Harrison Fixes: 760133d42f0a ("drm/i915/uc: Make unexpected firmware versions an error in debug builds") Cc: John Harrison Cc: Daniele Ceraolo Spurio Cc: Rodrigo Vivi Cc: Alan Previn Cc: Lucas De Marchi Cc: Jani Nikula Reviewed-by: Andi Shyti --- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c index 4ec7df9ed5ff3..e467d9af61876 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -18,7 +18,7 @@ #include "i915_reg.h" #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) -#define UNEXPECTED gt_err +#define UNEXPECTED gt_probe_error #else #define UNEXPECTED gt_notice #endif