From patchwork Fri Aug 26 02:36:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12955469 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 9946CECAAA3 for ; Fri, 26 Aug 2022 02:36:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BAA3510E162; Fri, 26 Aug 2022 02:36:52 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id E4AA910E10F; Fri, 26 Aug 2022 02:36:45 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4MDP9L1bD7z4wgv; Fri, 26 Aug 2022 12:36:37 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1661481400; bh=WGwi+ljsDERmTrvD7FgH6btCL+ApehLH36qFOcbf57k=; h=Date:From:To:Cc:Subject:From; b=WBEzthhTQQs+iXWxKaWDVGI0u9iYD2pChYgPY0IHYbppVAi7Tc6bluR2VIXd2FliO WoPTotj0msqCf5JATkcAs1sCATV7iB3CXizarRYPnkOCPBkXSelU0ISpl7FLsLShyO M0OAx8nEg8oIN8sIFN5WhUuV0tMXR7y1KCr+YyNZwU8yZylCMVXcsEV8Ib980vgwLk rftE65GoVQHzA/e1awr0ZWxzEjynQeXstYna4bSAbyFAy59KbBizRKta3Hd+XNAimX rjLOrqlkBcXjwKtwRrqINSlnVeNg0xIsUTwHza13Th9SrAX+I/ziVdYKvstfJ1AoYP zb5OFy7jZTBGw== Date: Fri, 26 Aug 2022 12:36:36 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Dave Airlie Subject: linux-next: build failure after merge of the drm-intel tree Message-ID: <20220826123636.72fbea19@canb.auug.org.au> MIME-Version: 1.0 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: Intel Graphics , Linux Next Mailing List , John Harrison , DRI , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/gt/uc/intel_guc.c: In function 'intel_guc_dump_time_info': drivers/gpu/drm/i915/gt/uc/intel_guc.c:399:9: error: implicit declaration of function 'intel_device_info_print_runtime'; did you mean 'intel_device_info_print'? [-Werror=implicit-function-declaration] 399 | intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | intel_device_info_print Caused by commit c7d3c8447b26 ("drm/i915: combine device info printing into one") interacting with commit 368d179adbac ("drm/i915/guc: Add GuC <-> kernel time stamp translation information") from the drm tree. I have applied the following merge fix patch for today: From: Stephen Rothwell Date: Fri, 26 Aug 2022 12:30:19 +1000 Subject: [PATCH] fix up for "drm/i915/guc: Add GuC <-> kernel time stamp translation information" interacting with "drm/i915: combine device info printing into one". Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c index ab4aacc516aa..977278d71182 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c @@ -396,7 +396,7 @@ void intel_guc_dump_time_info(struct intel_guc *guc, struct drm_printer *p) u32 stamp = 0; u64 ktime; - intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p); + intel_device_info_print(INTEL_INFO(gt->i915), RUNTIME_INFO(gt->i915), p); with_intel_runtime_pm(>->i915->runtime_pm, wakeref) stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP);