From patchwork Tue Oct 1 01:38:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13817311 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 4F4FACEB2D3 for ; Tue, 1 Oct 2024 01:38:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F79610E5B5; Tue, 1 Oct 2024 01:38:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="S6gJRfsV"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB09010E5B2; Tue, 1 Oct 2024 01:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1727746712; bh=7AJU3cM5clBinSxqOdEFLA7CLsu9mIr7mYElmD4jpFM=; h=Date:From:To:Cc:Subject:From; b=S6gJRfsVMBjeXX39wf0sFrYNyNM8bkz9tQ73G9D9Ecc0PcFIfrYyXBljNBKn/+ADJ 5M8qRvYV0+KPFuMWhf+YHkurv7geHvCWiEHJidTZklxepWDwsY3Xx/aXCX7ChG2C6B gI5W1+0/w+0isKWOnFqIa9flPLmnBDbDHNjf/0m8xZqpIkPvJ/13Tcweuj5A2IO63N Y2mP2JEyoX7KCc4iJvWur2c1grfS92POS6xyuVkvwG3xniRmJUXoKf/e13dFocR0bX JjwGPoJT/sqFm96gvNfk8o5rWETEUORYNfIUGDs/oxzCd+2JjUWOYLcj1bnqg8fnpa Hzq64DEAQ2Amg== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4XHgZG5llRz4wd6; Tue, 1 Oct 2024 11:38:30 +1000 (AEST) Date: Tue, 1 Oct 2024 11:38:30 +1000 From: Stephen Rothwell To: Lucas De Marchi , Thomas =?utf-8?q?Hellstr?= =?utf-8?q?=C3=B6m?= , Simona Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: Ville =?utf-8?b?U3lyasOkbMOk?= , Maarten Lankhorst , Intel Graphics , DRI , DRM XE List , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the drm-xe tree Message-ID: <20241001113830.4ff4d3e5@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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, After merging the drm-xe tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/xe/display/xe_display.c: In function 'xe_display_pm_shutdown': drivers/gpu/drm/xe/display/xe_display.c:382:27: error: passing argument 1 of 'intel_dmc_suspend' from incompatible pointer type [-Wincompatible-pointer-types] 382 | intel_dmc_suspend(xe); | ^~ | | | struct xe_device * In file included from drivers/gpu/drm/xe/display/xe_display.c:24: drivers/gpu/drm/i915/display/intel_dmc.h:22:46: note: expected 'struct intel_display *' but argument is of type 'struct xe_device *' 22 | void intel_dmc_suspend(struct intel_display *display); | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ Caused by commit 501d799a47e2 ("drm/xe: Wire up device shutdown handler") interacting with commit 5c30cfa295cc ("drm/i915/dmc: Convert DMC code to intel_display") from the drm-intel tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Tue, 1 Oct 2024 11:30:00 +1000 Subject: [PATCH] fix up for "drm/xe: Wire up device shutdown handler" interacting with commit 5c30cfa295cc ("drm/i915/dmc: Convert DMC code to intel_display") from the drm-intel tree. --- drivers/gpu/drm/xe/display/xe_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 957ae763531d..ca00a365080f 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -379,7 +379,7 @@ void xe_display_pm_shutdown(struct xe_device *xe) intel_opregion_suspend(display, PCI_D3cold); - intel_dmc_suspend(xe); + intel_dmc_suspend(display); } void xe_display_pm_runtime_suspend(struct xe_device *xe)