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 E7F20CD4F54 for ; Fri, 29 May 2026 14:05:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C09710FF9E; Fri, 29 May 2026 14:05:25 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="agB55+sf"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 62CEB10FF9E; Fri, 29 May 2026 14:05:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1780063525; x=1811599525; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=UrYyY//1QP7ZW0C22ur9jMEF6YnoCI3RSaPIDv+Qoos=; b=agB55+sfLMMiq3Gk60DctRmlQsy5tV10tCzg9DuJ3F1XDGrQEdUk2QLL CPEi+kAGAicQyu7ktpIi6OdTjhVx1VNNx4HKv5IxsUBM36RZ9O8augmIE iSOhjh98eTM9u2DXv9tbrDcdtVC+hIFhmN+zmJ492yoxfmHN+7JAxOydL Bt8MzIkB05b5baBBOn87U03GTMIdJovIL4Ung+c0If8Qa9J2MvqHT0L29 p/CFGOLgBjF/4MAx547jUrDx/nit/ZGurwFLmTLPFwtOvSTl3b0ik9e9/ 0698fAsManDLFwqvZcaAlgnuJnE0X+0WoP49DnjkWyAkPqi+nQNr7fqMn A==; X-CSE-ConnectionGUID: CUaVgnGDRRKz68/eMgxKjg== X-CSE-MsgGUID: cDWkcHfiTy6pKjw8pAQ52Q== X-IronPort-AV: E=McAfee;i="6800,10657,11801"; a="91225165" X-IronPort-AV: E=Sophos;i="6.24,175,1774335600"; d="scan'208";a="91225165" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2026 07:05:24 -0700 X-CSE-ConnectionGUID: 9RXLSDhzSb2ewWQTw9KkZQ== X-CSE-MsgGUID: z5FjHzUCRcWTqqVFG2wAnw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,175,1774335600"; d="scan'208";a="239858235" Received: from pgcooper-mobl3.ger.corp.intel.com (HELO localhost) ([10.245.244.182]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2026 07:05:21 -0700 Date: Fri, 29 May 2026 17:05:18 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, imre.deak@intel.com Subject: Re: [PATCH 14/24] drm/{i915,xe}: add intel_display_driver_shutdown_late() Message-ID: References: <0738680bb4946b7296c703c5f3d07c382a68fc27.1780051905.git.jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <0738680bb4946b7296c703c5f3d07c382a68fc27.1780051905.git.jani.nikula@intel.com> X-Patchwork-Hint: comment Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, May 29, 2026 at 02:03:58PM +0300, Jani Nikula wrote: > Add new function intel_display_driver_shutdown_late() to be called > "later" in the struct pci_driver .shutdown hook. > > There's a slight functional change in that > intel_display_driver_shutdown_late() returns early for > !HAS_DISPLAY(). Assume this is what we want, and there are no cases > where display engine is present but all pipes have been fused off. > > Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/display/intel_display_driver.c | 13 +++++++++++++ > drivers/gpu/drm/i915/display/intel_display_driver.h | 1 + > drivers/gpu/drm/i915/i915_driver.c | 7 ++----- > drivers/gpu/drm/xe/display/xe_display.c | 7 +------ > 4 files changed, 17 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c > index 7fee9ef88224..7f2d191b9ef0 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_driver.c > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c > @@ -681,6 +681,19 @@ void intel_display_driver_unregister(struct intel_display *display) > intel_vga_unregister(display); > } > > +void intel_display_driver_shutdown_late(struct intel_display *display) > +{ > + if (!HAS_DISPLAY(display)) > + return; > + > + /* > + * The only requirement is to reboot with display DC states disabled, > + * for now leaving all display power wells in the INIT power domain > + * enabled. > + */ > + intel_display_power_driver_remove(display); > +} > + > /* > * turn all crtc's off, but do not adjust state > * This has to be paired with a call to intel_modeset_setup_hw_state. > diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h > index adfde02465ea..61515577758b 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_driver.h > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h > @@ -24,6 +24,7 @@ void intel_display_driver_remove(struct intel_display *display); > void intel_display_driver_remove_noirq(struct intel_display *display); > void intel_display_driver_remove_nogem(struct intel_display *display); > void intel_display_driver_unregister(struct intel_display *display); > +void intel_display_driver_shutdown_late(struct intel_display *display); > > int intel_display_driver_pm_suspend(struct intel_display *display); > void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle); > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index b637c4dedf1b..140c562a8627 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -1073,17 +1073,14 @@ void i915_driver_shutdown(struct drm_i915_private *i915) > i915_gem_suspend(i915); > > /* > - * The only requirement is to reboot with display DC states disabled, > - * for now leaving all display power wells in the INIT power domain > - * enabled. > - * > * TODO: > * - unify the pci_driver::shutdown sequence here with the > * pci_driver.driver.pm.poweroff,poweroff_late sequence. > * - unify the driver remove and system/runtime suspend sequences with > * the above unified shutdown/poweroff sequence. > */ > - intel_display_power_driver_remove(display); > + > + intel_display_driver_shutdown_late(display); > enable_rpm_wakeref_asserts(&i915->runtime_pm); > > intel_runtime_pm_driver_last_release(&i915->runtime_pm); > diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c > index e17e05a8854c..fdc999c62bc9 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.c > +++ b/drivers/gpu/drm/xe/display/xe_display.c > @@ -219,12 +219,7 @@ void xe_display_shutdown_late(struct xe_device *xe) > if (!xe->info.probe_display) > return; > > - /* > - * The only requirement is to reboot with display DC states disabled, > - * for now leaving all display power wells in the INIT power domain > - * enabled. > - */ > - intel_display_power_driver_remove(display); > + intel_display_driver_shutdown_late(display); > } > > /* IRQ-related functions */ > -- > 2.47.3 -- Ville Syrjälä Intel