From nobody Mon Feb 9 09:43:31 2026 Received: from mail-pf1-f228.google.com (mail-pf1-f228.google.com [209.85.210.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CAD330F7E0 for ; Mon, 29 Dec 2025 21:59:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767045560; cv=none; b=ko3AIrDddE9zpFn4mEfXlk9frQGl9G2RCgcxGRnJhmI6j0cJnnneTrnHp9BNqm+bHbLc1ft9RoQHWi3CczYQxX4HZipikwWKolbj8enUG/SXZ2ALWHFmyzL4mwEGPVytsNcOsRphOkeosR/uDw5+L9szSfXw+rl88nJDAAoLRnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767045560; c=relaxed/simple; bh=6nUv0+ZaLBqqw8tQw1HbaOKBF+d4zgRY9GomeUM/oB8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o/Wqgm7jyOJHNrJiRI6vyk7ynDxjNpRt3gg6oUxgBdaAH+lpD110tul716KcOPf14QS0EgWz6YBoA9iaRdFy/94DEbS6QHPNEu0LznA1CH2TsUtiXxNF8tLiavYGK8WXJWtJITTI1mYfhWnHiizg0q1h14TIb0+5RBpt3QprwIY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=bqGyrBBC; arc=none smtp.client-ip=209.85.210.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="bqGyrBBC" Received: by mail-pf1-f228.google.com with SMTP id d2e1a72fcca58-7bab7c997eeso11092481b3a.0 for ; Mon, 29 Dec 2025 13:59:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767045559; x=1767650359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iO5bQdvPC15UP8CHevTImGh62fz7bMVkTIkttiBAsEo=; b=oFqSB244rfmpNsgOZ9qFsXjZUuPFDr5QvTYN0Ie3fn+NxxzevJV8MgaNz7gGKYW/yK 1D6NUxtU+wkR+fY5Kf6zL6jyXW+JHQL96PovtKjKFLAGDOkUbY3yITcgIWknW3QzTPNK gZrmuRNOHqN8RTXWDOM+gpqLKa9NWvMIg48LWXegfSQENeadALA9C2kcszWkpYawStT8 3teiJlypZ4jqXmUAP5JZeMLgxcIw0btMwFj/7CJ5fDuInL0ZSCeU8M7vx8ab/FtLNBqk lxIxmKlTQQzAzYnJPmRZoPGXIr+QXiSuagkmj5os7Sj98oRCTwb0Iv/wvn7E0nJwHXSh gKtQ== X-Forwarded-Encrypted: i=1; AJvYcCWpKJO3J1yxMc/ZshiO4V7ngBaF+HltUXLMXJIeSZRuEdw7wKUz8z6Bc1Qn9gLi8S4JJgImtmIz+PsxyWQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyDFQ6qR9S11iCSadSxqYQKuIa8r36umTk8kQh+Tf5K/3qHs52n ehhIduzlJLN8GXsuscLck2wIHb2Hay2v8NAhJJ6nGF7K8GKkggAotiI6sEXDHvyKMhzbpe4cca1 6XFXBqPR+dhimKa8oTjHT63NctO7i+ZEfIUGUiz3UcN0FqPU89/dXSkx5kN9fIEHy0Q35vKfmlE j3Ww8OoAhc25DTqsKpGCdkejf8JzVCMCHtjWygFmzHfsCTqxViZwmEbRxt2ZxMegPtLyrkMtNoC 5+kPlP0NU8/gXrQ X-Gm-Gg: AY/fxX75GedvUTH+ntJ5Hi/3Pa55ON4yJJIKL0nXsXK/BojsUBm982fy1vVIY+3bchk bXDM+S8Wr3OBJIHCGgIA/bWNUa1bP1ZYEUcfkfVJtk8DYl+R0CEGLbI400Q5wTQ+51VMRkRHNSr gZPAXAr5BvHb5Sd1PqQZcfuJXwmB3BtOyD6p7jG2GuCJD1TM/GveHk/DHuakFcpLKyrYOHpPOlF RChEHgQgsOkDcIzmbccqI7NG1GS6wIHksZ5F64/DvZhWgIhLugMPFdokZC2H+DHGRlGkpzUMdJI V3M/NhR+mKv8swJX0ic7caxJE3WJuqRoZDdQXGY8u0a1KgdPvEfWKIk80lyVMwJIlZMVMA8yeZB EZaJ0+/xVLsscrDITfoSTtX95Jtys9VfgehtiEHHe6qJZz0KmePb2ou6xePmODZvIphcj29LgUQ AenK8O8qETz7AIX26uuwqAhiYuu2xgKTCIVnDsolEtCSvf X-Google-Smtp-Source: AGHT+IE78M82g4KTLJ9peT7Kv4RKgGnRPugTwGwmPi5Lo5zs1UlSHfxUtDjgAhxVLGLv7zVqySplLxmoXeme X-Received: by 2002:a05:6a21:32aa:b0:35f:30ff:89db with SMTP id adf61e73a8af0-376a8eb6910mr29931920637.19.1767045558698; Mon, 29 Dec 2025 13:59:18 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-101.dlp.protect.broadcom.com. [144.49.247.101]) by smtp-relay.gmail.com with ESMTPS id 41be03b00d2f7-c1e7bb6c6ebsm1718151a12.11.2025.12.29.13.59.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Dec 2025 13:59:18 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-88a47331c39so254868016d6.2 for ; Mon, 29 Dec 2025 13:59:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1767045555; x=1767650355; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iO5bQdvPC15UP8CHevTImGh62fz7bMVkTIkttiBAsEo=; b=bqGyrBBCrqS2oajQaZRd7/GGYb1JG/dfh7TFfyhmWQgLRBTLl9VY9dBP4Bku/UZW99 ugaXnuQTjV+RUrXq+yd0dIBeYDWnin8JYgrc8rJbq1vqiXClScaG9f4rKfjJXwO1YD1F 6gPImonhkxIfHAOZNAJo8o/8kmB9R9ye3GAuI= X-Forwarded-Encrypted: i=1; AJvYcCXT/S1FAeQWfq2/g0hkAsPac+UthGr/wERQDaarKPu6wG7DRizyVL7zIq8AkXtbcElh3OEn518oc9zThEg=@vger.kernel.org X-Received: by 2002:a05:6214:154f:b0:87c:208b:9556 with SMTP id 6a1803df08f44-88d82526733mr349336656d6.30.1767045555368; Mon, 29 Dec 2025 13:59:15 -0800 (PST) X-Received: by 2002:a05:6214:154f:b0:87c:208b:9556 with SMTP id 6a1803df08f44-88d82526733mr349336506d6.30.1767045554923; Mon, 29 Dec 2025 13:59:14 -0800 (PST) Received: from localhost.localdomain (pool-173-49-113-140.phlapa.fios.verizon.net. [173.49.113.140]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-88d9759f164sm231530026d6.24.2025.12.29.13.59.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Dec 2025 13:59:14 -0800 (PST) From: Zack Rusin To: dri-devel@lists.freedesktop.org Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org Subject: [PATCH 02/12] drm/vmwgfx: Use devm aperture helpers for sysfb restore on probe failure Date: Mon, 29 Dec 2025 16:58:08 -0500 Message-ID: <20251229215906.3688205-3-zack.rusin@broadcom.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251229215906.3688205-1-zack.rusin@broadcom.com> References: <20251229215906.3688205-1-zack.rusin@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" Use devm_aperture_remove_conflicting_pci_devices() instead of the non-devm variant to automatically restore the system framebuffer (efifb/simpledrm) if the driver's probe fails after removing the firmware framebuffer. Call devm_aperture_remove_conflicting_pci_devices_done() after successful probe to cancel the automatic restore, as the driver is now responsible for display output. Signed-off-by: Zack Rusin Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Simona Vetter Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/v= mwgfx_drv.c index 599052d07ae8..1b0fc4f9d4af 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1622,7 +1622,12 @@ static int vmw_probe(struct pci_dev *pdev, const str= uct pci_device_id *ent) struct vmw_private *vmw; int ret; =20 - ret =3D aperture_remove_conflicting_pci_devices(pdev, driver.name); + /* + * Use devm variant to automatically restore sysfb if probe fails. + * This ensures the user doesn't lose display if our probe fails + * after removing the firmware framebuffer (efifb/simpledrm). + */ + ret =3D devm_aperture_remove_conflicting_pci_devices(pdev, driver.name); if (ret) goto out_error; =20 @@ -1647,6 +1652,12 @@ static int vmw_probe(struct pci_dev *pdev, const str= uct pci_device_id *ent) if (ret) goto out_unload; =20 + /* + * Probe succeeded - cancel the automatic sysfb restore action. + * We're now responsible for display output. + */ + devm_aperture_remove_conflicting_pci_devices_done(pdev); + vmw_fifo_resource_inc(vmw); vmw_svga_enable(vmw); drm_client_setup(&vmw->drm, NULL); --=20 2.48.1