From mboxrd@z Thu Jan 1 00:00:00 1970 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 51B82D1CDAE for ; Tue, 22 Oct 2024 08:20:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F98F10E1CE; Tue, 22 Oct 2024 08:20:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="RDP6/bOe"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 56C6110E1CE; Tue, 22 Oct 2024 08:20:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729585208; x=1761121208; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=nm01cl+h2YzLRmBMSq6mKanbQhKF+pe3IHltRaqzpDQ=; b=RDP6/bOe4uugKOk4xBhnjAr5wYH3vtvwKpoMd72dF9PVix1q93m9D4S7 TTGKPB/pewTLbuQR00/RunWuM0RK0c4cXF9gB3oNXDQh3ojc1ug4MVK02 U6Hf14hJZS3sue/EPhnAUA3aPmDtASOZbct6UPhoPbrcZfEPQj1XoWfT2 yevzSwfCIC/QspmvLw+GkiZK3YGjB3Tu/+Gfy8YZ9XHJeKXDFG3n/vLeJ fxd/f6nc+qY6YwPi7fZ0ndRVuqQoDjKkn+ElgdOVebxMVjy4VIc2kaY/H tWgWrH6Ujv1P7/hNhI0uwCUdbwPYbA3hggr7koQUYJF33q/17UOLj93H/ A==; X-CSE-ConnectionGUID: VYJ57GCZRy69mREW7XKIZw== X-CSE-MsgGUID: c+yq+KjmRC+WxsZvB4uxNA== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="39649857" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="39649857" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2024 01:20:07 -0700 X-CSE-ConnectionGUID: lCii77FcQvO1V6oRzYPzTw== X-CSE-MsgGUID: G+8W2z9gSCW87/2Y4UNd7w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,222,1725346800"; d="scan'208";a="84384249" Received: from sosterlu-desk.ger.corp.intel.com (HELO [10.245.244.157]) ([10.245.244.157]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2024 01:19:53 -0700 Message-ID: Date: Tue, 22 Oct 2024 09:19:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [drm-intel-next PATCH] drm/xe: fix build failure originating from backmerge To: Jani Nikula , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: Rodrigo Vivi References: <20241022080943.763580-1-jani.nikula@intel.com> Content-Language: en-GB From: Matthew Auld In-Reply-To: <20241022080943.763580-1-jani.nikula@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On 22/10/2024 09:09, Jani Nikula wrote: > ../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 [-Werror=incompatible-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); > | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ > > Fixes: c141cf76918e ("Merge drm/drm-next into drm-intel-next") > Cc: Rodrigo Vivi > Signed-off-by: Jani Nikula Acked-by: Matthew Auld > --- > 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)