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 791C3CD4F24 for ; Wed, 13 May 2026 12:09:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6560510EE09; Wed, 13 May 2026 12:09:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="MUbpMepK"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F94810E5D3; Wed, 13 May 2026 12:09:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778674161; x=1810210161; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=MCg9bWIEIwynTQMIlWJqrju5cyWaypW67stY5xP5h2Q=; b=MUbpMepKHzOQGuFUkIpJkhxHeJ8PAd3qB36gToFOIyFrYe3eO4ogiIoF aSNF4Se52y6Q728od9/BUkpOU7m7k0Gj+VM38KcJfYRtJMLzDmXsNRhzN Reo4IFLUFy1yejC0TeDyh6clDgbIT8zeM8jk5HwtIGcrTTzPpnNnSnj9i YO5ODxxkQLxqZxHnh0L3KbkGahN2NGBv7RgDBN10fEikBmsBfW3jLwWDc ujUrTK+ckAHt16fpJjjosar5qE9Qd/rkCttEDzWD3TncDfkwuTIvoa7qs QdrCPpI6vCGwzbTbmueeaydMloKMs3TKrB/oHhQt+b1pFk58CLxOZtyp3 Q==; X-CSE-ConnectionGUID: hwcRhVq5Qcys/mzJNNVRvQ== X-CSE-MsgGUID: 4/j5tWuZTMqye4iJDC5VjQ== X-IronPort-AV: E=McAfee;i="6800,10657,11784"; a="79630194" X-IronPort-AV: E=Sophos;i="6.23,232,1770624000"; d="scan'208";a="79630194" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2026 05:09:21 -0700 X-CSE-ConnectionGUID: csF/yADGRMiQYf1jNniftw== X-CSE-MsgGUID: Lv2+JNIORAad/a2sp8t+Aw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,232,1770624000"; d="scan'208";a="237967691" Received: from amilburn-desk.amilburn-desk (HELO localhost) ([10.245.244.10]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2026 05:09:17 -0700 Date: Wed, 13 May 2026 15:09:13 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: Re: [RESEND 1/6] drm/{i915, xe}: move xe_display_flush_cleanup_work() to i915 display Message-ID: References: <7aecde385b66dbf7d0e61759528c6cd643581a3d.1778659089.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: <7aecde385b66dbf7d0e61759528c6cd643581a3d.1778659089.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 Wed, May 13, 2026 at 10:58:35AM +0300, Jani Nikula wrote: > xe_display_flush_cleanup_work() is a bit of an oddball function in xe > display code. There shouldn't be anything this specific or xe > specific. While I'm not sure what the correct refactor for the function > should be, move it to shared display code for starters, next to the > eerily similar but slightly different intel_has_pending_fb_unpin() that > is only called from i915 core. > > The main goal here is to unblock some refactors on > for_each_intel_crtc(). > > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_display.c | 21 +++++++++++++++ > drivers/gpu/drm/i915/display/intel_display.h | 1 + > drivers/gpu/drm/xe/display/xe_display.c | 27 +++----------------- > 3 files changed, 25 insertions(+), 24 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index d5cf1476c7b9..50feca52b962 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -737,6 +737,27 @@ bool intel_has_pending_fb_unpin(struct intel_display *display) > return false; > } > > +void intel_display_flush_cleanup_work(struct intel_display *display) > +{ > + struct intel_crtc *crtc; > + > + for_each_intel_crtc(display->drm, crtc) { > + struct drm_crtc_commit *commit; > + > + spin_lock(&crtc->base.commit_lock); > + commit = list_first_entry_or_null(&crtc->base.commit_list, > + struct drm_crtc_commit, commit_entry); > + if (commit) > + drm_crtc_commit_get(commit); > + spin_unlock(&crtc->base.commit_lock); > + > + if (commit) { > + wait_for_completion(&commit->cleanup_done); > + drm_crtc_commit_put(commit); > + } > + } > +} > + > /* > * Finds the encoder associated with the given CRTC. This can only be > * used when we know that the CRTC isn't feeding multiple encoders! > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h > index a43ada0c0502..65f8c81a7bae 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -402,6 +402,7 @@ void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state); > void i830_enable_pipe(struct intel_display *display, enum pipe pipe); > void i830_disable_pipe(struct intel_display *display, enum pipe pipe); > bool intel_has_pending_fb_unpin(struct intel_display *display); > +void intel_display_flush_cleanup_work(struct intel_display *display); > void intel_encoder_destroy(struct drm_encoder *encoder); > struct drm_display_mode * > intel_encoder_current_mode(struct intel_encoder *encoder); > diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c > index aa73023b7398..ef27fdfdbab2 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.c > +++ b/drivers/gpu/drm/xe/display/xe_display.c > @@ -258,27 +258,6 @@ static bool suspend_to_idle(void) > return false; > } > > -static void xe_display_flush_cleanup_work(struct xe_device *xe) > -{ > - struct intel_crtc *crtc; > - > - for_each_intel_crtc(&xe->drm, crtc) { > - struct drm_crtc_commit *commit; > - > - spin_lock(&crtc->base.commit_lock); > - commit = list_first_entry_or_null(&crtc->base.commit_list, > - struct drm_crtc_commit, commit_entry); > - if (commit) > - drm_crtc_commit_get(commit); > - spin_unlock(&crtc->base.commit_lock); > - > - if (commit) { > - wait_for_completion(&commit->cleanup_done); > - drm_crtc_commit_put(commit); > - } > - } > -} > - > static void xe_display_enable_d3cold(struct xe_device *xe) > { > struct intel_display *display = xe->display; > @@ -292,7 +271,7 @@ static void xe_display_enable_d3cold(struct xe_device *xe) > */ > intel_power_domains_disable(display); > > - xe_display_flush_cleanup_work(xe); > + intel_display_flush_cleanup_work(display); > > intel_opregion_suspend(display, PCI_D3cold); > > @@ -347,7 +326,7 @@ void xe_display_pm_suspend(struct xe_device *xe) > intel_display_driver_suspend(display); > } > > - xe_display_flush_cleanup_work(xe); > + intel_display_flush_cleanup_work(display); intel_display_driver_suspend() already flushes the cleanup wq. So I think this is doing nothing. The correct answer seems to be to nuke the whole thing. We are missing the wq flush from the shutdown() path in i915 however, so I suppose we should add it there. > > intel_encoder_block_all_hpds(display); > > @@ -379,7 +358,7 @@ void xe_display_pm_shutdown(struct xe_device *xe) > intel_display_driver_suspend(display); This should rather be the same atomic helper shutdown that i915 uses. I guess what we want is a intel_display_driver_shutdown() to pair up with intel_display_driver_suspend(). > } > > - xe_display_flush_cleanup_work(xe); > + intel_display_flush_cleanup_work(display); > intel_dp_mst_suspend(display); > intel_encoder_block_all_hpds(display); > intel_hpd_cancel_work(display); > -- > 2.47.3 -- Ville Syrjälä Intel