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 0288810FC456 for ; Wed, 8 Apr 2026 23:35:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E34A10E6FD; Wed, 8 Apr 2026 23:35:19 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="kaLlNo24"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0EDD610E702; Wed, 8 Apr 2026 23:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775691318; x=1807227318; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=z1H5iVBVXvfrT9Lfgb75s4vfDijExo/2/XscAqSYLlw=; b=kaLlNo24UV1otBDb/hkkKOE2FYzMDdCTtG1+6SHKchLEAXm4HIya3h9u X4ao+5SaEwG43hmEh7Gi4kNS3Oyk5B4b3VlDYKM3okYmt4UkjF9v9RnXe al0ACSMrnC4bMU2FPSa+thkQlfhpnfv0UUE0r/7D1btdyFFWV80nJGN5a 4B9k6RJb8HQ1xTS6dMpwiXd3Mz3I3w/A01J/WOyFSATcXIR8mrvuZHPrL LhheqPJ7sNgerEUGkTtMNRGziHOc4PWkhc1y3q48dIKTUg4rg2W3xE4US f82kcWigEHFo7k7VrPJO09XUbYHH1o2wPdT69/RT3ak/COVX4gos6P1l7 g==; X-CSE-ConnectionGUID: FIAwg4lTR/GCI2BJt29caA== X-CSE-MsgGUID: HXVD1I0SStOnST31JyhUqw== X-IronPort-AV: E=McAfee;i="6800,10657,11753"; a="76705988" X-IronPort-AV: E=Sophos;i="6.23,168,1770624000"; d="scan'208";a="76705988" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2026 16:35:17 -0700 X-CSE-ConnectionGUID: momyI7C9TD2JMqCiwGgZ5Q== X-CSE-MsgGUID: +S6SR6BSSauGC6S+/HDzGA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,168,1770624000"; d="scan'208";a="230273110" Received: from amilburn-desk.amilburn-desk (HELO localhost) ([10.245.245.73]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2026 16:35:14 -0700 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Simona Vetter , =?UTF-8?q?Christian=20K=C3=B6nig?= , Jani Nikula , =?UTF-8?q?Jouni=20H=C3=B6gander?= , Maarten Lankhorst Subject: [PATCH 2/6] drm/i915/reset: Reorganize display reset code Date: Thu, 9 Apr 2026 02:34:54 +0300 Message-ID: <20260408233458.22666-3-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260408233458.22666-1-ville.syrjala@linux.intel.com> References: <20260408233458.22666-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland 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" From: Ville Syrjälä Stop returning the "is there a display?" status from intel_display_reset_prepare(). I plan to move the pending_fb_pin into the i915 code, so I need to make that determination already before intel_display_reset_prepare() is called. Add a new intel_display_reset_supported() function for that. Cc: Simona Vetter Cc: Christian König Cc: Jani Nikula Cc: Jouni Högander Cc: Maarten Lankhorst Signed-off-by: Ville Syrjälä --- .../drm/i915/display/intel_display_reset.c | 23 ++++++++----------- .../drm/i915/display/intel_display_reset.h | 3 ++- drivers/gpu/drm/i915/gt/intel_reset.c | 13 +++++++---- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_reset.c b/drivers/gpu/drm/i915/display/intel_display_reset.c index d00ef5bdcbda..137a2a33c8b0 100644 --- a/drivers/gpu/drm/i915/display/intel_display_reset.c +++ b/drivers/gpu/drm/i915/display/intel_display_reset.c @@ -16,22 +16,24 @@ #include "intel_hotplug.h" #include "intel_pps.h" +bool intel_display_reset_supported(struct intel_display *display) +{ + return HAS_DISPLAY(display); +} + bool intel_display_reset_test(struct intel_display *display) { - return display->params.force_reset_modeset_test; + return HAS_DISPLAY(display) && + display->params.force_reset_modeset_test; } -/* returns true if intel_display_reset_finish() needs to be called */ -bool intel_display_reset_prepare(struct intel_display *display, +void intel_display_reset_prepare(struct intel_display *display, modeset_stuck_fn modeset_stuck, void *context) { struct drm_modeset_acquire_ctx *ctx = &display->restore.reset_ctx; struct drm_atomic_state *state; int ret; - if (!HAS_DISPLAY(display)) - return false; - if (atomic_read(&display->restore.pending_fb_pin)) { drm_dbg_kms(display->drm, "Modeset potentially stuck, unbreaking through wedging\n"); @@ -60,7 +62,7 @@ bool intel_display_reset_prepare(struct intel_display *display, ret = PTR_ERR(state); drm_err(display->drm, "Duplicating state failed with %i\n", ret); - return true; + return; } ret = drm_atomic_helper_disable_all(display->drm, ctx); @@ -68,13 +70,11 @@ bool intel_display_reset_prepare(struct intel_display *display, drm_err(display->drm, "Suspending crtc's failed with %i\n", ret); drm_atomic_state_put(state); - return true; + return; } display->restore.modeset_state = state; state->acquire_ctx = ctx; - - return true; } void intel_display_reset_finish(struct intel_display *display, bool test_only) @@ -83,9 +83,6 @@ void intel_display_reset_finish(struct intel_display *display, bool test_only) struct drm_atomic_state *state; int ret; - if (!HAS_DISPLAY(display)) - return; - state = fetch_and_zero(&display->restore.modeset_state); if (!state) goto unlock; diff --git a/drivers/gpu/drm/i915/display/intel_display_reset.h b/drivers/gpu/drm/i915/display/intel_display_reset.h index 8b3bda134454..e0f15e757728 100644 --- a/drivers/gpu/drm/i915/display/intel_display_reset.h +++ b/drivers/gpu/drm/i915/display/intel_display_reset.h @@ -12,8 +12,9 @@ struct intel_display; typedef void modeset_stuck_fn(void *context); +bool intel_display_reset_supported(struct intel_display *display); bool intel_display_reset_test(struct intel_display *display); -bool intel_display_reset_prepare(struct intel_display *display, +void intel_display_reset_prepare(struct intel_display *display, modeset_stuck_fn modeset_stuck, void *context); void intel_display_reset_finish(struct intel_display *display, bool test_only); diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index 37272871b0f2..ffd11767874f 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -1425,16 +1425,19 @@ static void intel_gt_reset_global(struct intel_gt *gt, bool need_display_reset; bool reset_display; - need_display_reset = intel_gt_gpu_reset_clobbers_display(gt) && + need_display_reset = + intel_display_reset_supported(display) && + intel_gt_gpu_reset_clobbers_display(gt) && intel_has_gpu_reset(gt); - reset_display = intel_display_reset_test(display) || + reset_display = + intel_display_reset_test(display) || need_display_reset; if (reset_display) - reset_display = intel_display_reset_prepare(display, - display_reset_modeset_stuck, - gt); + intel_display_reset_prepare(display, + display_reset_modeset_stuck, + gt); intel_gt_reset(gt, engine_mask, reason); -- 2.52.0