Messages in this thread Patch in this message | | | Date | Fri, 26 Aug 2022 12:36:36 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the drm-intel tree |
| |
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 <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au> --- 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); -- 2.35.1 -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |