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 02F63D46BEB for ; Wed, 28 Jan 2026 18:10:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E73310E752; Wed, 28 Jan 2026 18:10:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="LyRVsbgF"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0BEF010E751; Wed, 28 Jan 2026 18:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1769623805; x=1801159805; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=796uLLB/5au/7vErqbPrVpR9cVpKajmRl3deQQSi3Xc=; b=LyRVsbgFMA52Vt0yE1s/RJCY3kjVtwJI2nZuPws6G1jqz23KnzaGR82h r8Ne+sKWnRv2YFpEcQ1/rh//inxP/HJa8zXNnCSINAR9lu4pB7jtlxsZa Pjr+0zhwX0t2yNkDX/w/9IQyumnG8GfjFXPJC0QoXNxeEkOs58exxBHWg OZvO7g3e2QmC3S8WbN2GmOtfxX4gu3cFZgE+dfiDlhSxoQv0biNY//gBG WJcFTR68PzQfeEurjk28yBvJECm/I4ENs32A5WdzhbgYAcx/puL+7acKd 5HB64tSGh5h8Q0LeNkiZmqUgQ84k3PfIM5b0pM2t/xbEqVjAC9dnAUFzL Q==; X-CSE-ConnectionGUID: RzYyY5voSUeME/OKHvnIeA== X-CSE-MsgGUID: fU0Fa/1rTBy+YrWbLscELA== X-IronPort-AV: E=McAfee;i="6800,10657,11685"; a="70564009" X-IronPort-AV: E=Sophos;i="6.21,258,1763452800"; d="scan'208";a="70564009" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2026 10:10:04 -0800 X-CSE-ConnectionGUID: sl1R4u1MSx2tTurLyPFrYA== X-CSE-MsgGUID: cvygIK2sQTe884zzLpzrsA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,258,1763452800"; d="scan'208";a="208706917" Received: from administrator-system-product-name.igk.intel.com ([10.91.214.181]) by fmviesa010.fm.intel.com with ESMTP; 28 Jan 2026 10:10:01 -0800 From: =?UTF-8?q?Micha=C5=82=20Grzelak?= To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: Jani Nikula , Andi Shyti , Krzysztof Karas , Sebastian Brzezinka , Krzysztof Niemiec , Janusz Krzysztofik , =?UTF-8?q?Micha=C5=82=20Grzelak?= Subject: [PATCH v1] i915/i915_driver: move intel_gvt_init() level higher Date: Wed, 28 Jan 2026 19:09:33 +0100 Message-ID: <20260128180933.2561419-1-michal.grzelak@intel.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 Content-Transfer-Encoding: 8bit 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" i915_driver_probe() cannot currently handle error of intel_gvt_init() because it is called from i915_driver_hw_probe(). Nevertheless, it's error path is done in i915_driver_probe(). Fault of i915_driver_hw_probe() thus causes list corruption, since intel_gvt_driver_remove() was called twice. Move intel_gvt_init() up to i915_driver_probe(). Adjust error path of i915_driver_hw_probe() so that intel_gvt_driver_remove() is called always once. Signed-off-by: Michał Grzelak --- drivers/gpu/drm/i915/i915_driver.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 1e087dfe03d0..0f507b8ae2f1 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -557,10 +557,6 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) drm_dbg(&dev_priv->drm, "can't enable MSI"); } - ret = intel_gvt_init(dev_priv); - if (ret) - goto err_msi; - intel_opregion_setup(display); ret = i915_pcode_init(dev_priv); @@ -581,9 +577,6 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) err_opregion: intel_opregion_cleanup(display); -err_msi: - if (pdev->msi_enabled) - pci_disable_msi(pdev); err_mem_regions: intel_memory_regions_driver_release(dev_priv); err_ggtt: @@ -870,9 +863,13 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret < 0) goto out_cleanup_mmio; + ret = intel_gvt_init(i915); + if (ret) + goto out_cleanup_hw; + ret = intel_display_driver_probe_noirq(display); if (ret < 0) - goto out_cleanup_hw; + goto out_cleanup_gvt; ret = intel_irq_install(i915); if (ret) @@ -921,6 +918,10 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) intel_irq_uninstall(i915); out_cleanup_modeset: intel_display_driver_remove_nogem(display); +out_cleanup_gvt: + if (pdev->msi_enabled) + pci_disable_msi(pdev); + intel_gvt_driver_remove(i915); out_cleanup_hw: i915_driver_hw_remove(i915); intel_memory_regions_driver_release(i915); @@ -928,7 +929,6 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) i915_gem_drain_freed_objects(i915); i915_ggtt_driver_late_release(i915); out_cleanup_mmio: - intel_gvt_driver_remove(i915); i915_driver_mmio_release(i915); out_runtime_pm_put: enable_rpm_wakeref_asserts(&i915->runtime_pm); -- 2.45.2