From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Aaron Plattner <aplattner@nvidia.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>,
stable@vger.kernel.org,
Javier Martinez Canillas <javierm@redhat.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Alex Deucher <alexander.deucher@amd.com>,
Daniel Vetter <daniel.vetter@intel.com>,
Sam Ravnborg <sam@ravnborg.org>, Helge Deller <deller@gmx.de>
Subject: [PATCH 11/11] video/aperture: Only remove sysfb on the default vga pci device
Date: Wed, 11 Jan 2023 16:41:12 +0100 [thread overview]
Message-ID: <20230111154112.90575-11-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20230111154112.90575-1-daniel.vetter@ffwll.ch>
This fixes a regression introduced by ee7a69aa38d8 ("fbdev: Disable
sysfb device registration when removing conflicting FBs"), where we
remove the sysfb when loading a driver for an unrelated pci device,
resulting in the user loosing their efifb console or similar.
Note that in practice this only is a problem with the nvidia blob,
because that's the only gpu driver people might install which does not
come with an fbdev driver of it's own. For everyone else the real gpu
driver will restor a working console.
Also note that in the referenced bug there's confusion that this same
bug also happens on amdgpu. But that was just another amdgpu specific
regression, which just happened to happen at roughly the same time and
with the same user-observable symptons. That bug is fixed now, see
https://bugzilla.kernel.org/show_bug.cgi?id=216331#c15
For the above reasons the cc: stable is just notionally, this patch
will need a backport and that's up to nvidia if they care enough.
References: https://bugzilla.kernel.org/show_bug.cgi?id=216303#c28
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Aaron Plattner <aplattner@nvidia.com>
Cc: Javier Martinez Canillas <javierm@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Helge Deller <deller@gmx.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: <stable@vger.kernel.org> # v5.19+ (if someone else does the backport)
---
drivers/video/aperture.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c
index ba565515480d..a1821d369bb1 100644
--- a/drivers/video/aperture.c
+++ b/drivers/video/aperture.c
@@ -321,15 +321,16 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na
primary = pdev == vga_default_device();
+ if (primary)
+ sysfb_disable();
+
for (bar = 0; bar < PCI_STD_NUM_BARS; ++bar) {
if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
continue;
base = pci_resource_start(pdev, bar);
size = pci_resource_len(pdev, bar);
- ret = aperture_remove_conflicting_devices(base, size, name);
- if (ret)
- return ret;
+ aperture_detach_devices(base, size);
}
if (!primary)
--
2.39.0
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Aaron Plattner <aplattner@nvidia.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>,
stable@vger.kernel.org,
Javier Martinez Canillas <javierm@redhat.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Alex Deucher <alexander.deucher@amd.com>,
Daniel Vetter <daniel.vetter@intel.com>,
Sam Ravnborg <sam@ravnborg.org>, Helge Deller <deller@gmx.de>
Subject: [Intel-gfx] [PATCH 11/11] video/aperture: Only remove sysfb on the default vga pci device
Date: Wed, 11 Jan 2023 16:41:12 +0100 [thread overview]
Message-ID: <20230111154112.90575-11-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20230111154112.90575-1-daniel.vetter@ffwll.ch>
This fixes a regression introduced by ee7a69aa38d8 ("fbdev: Disable
sysfb device registration when removing conflicting FBs"), where we
remove the sysfb when loading a driver for an unrelated pci device,
resulting in the user loosing their efifb console or similar.
Note that in practice this only is a problem with the nvidia blob,
because that's the only gpu driver people might install which does not
come with an fbdev driver of it's own. For everyone else the real gpu
driver will restor a working console.
Also note that in the referenced bug there's confusion that this same
bug also happens on amdgpu. But that was just another amdgpu specific
regression, which just happened to happen at roughly the same time and
with the same user-observable symptons. That bug is fixed now, see
https://bugzilla.kernel.org/show_bug.cgi?id=216331#c15
For the above reasons the cc: stable is just notionally, this patch
will need a backport and that's up to nvidia if they care enough.
References: https://bugzilla.kernel.org/show_bug.cgi?id=216303#c28
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Aaron Plattner <aplattner@nvidia.com>
Cc: Javier Martinez Canillas <javierm@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Helge Deller <deller@gmx.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: <stable@vger.kernel.org> # v5.19+ (if someone else does the backport)
---
drivers/video/aperture.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c
index ba565515480d..a1821d369bb1 100644
--- a/drivers/video/aperture.c
+++ b/drivers/video/aperture.c
@@ -321,15 +321,16 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na
primary = pdev == vga_default_device();
+ if (primary)
+ sysfb_disable();
+
for (bar = 0; bar < PCI_STD_NUM_BARS; ++bar) {
if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
continue;
base = pci_resource_start(pdev, bar);
size = pci_resource_len(pdev, bar);
- ret = aperture_remove_conflicting_devices(base, size, name);
- if (ret)
- return ret;
+ aperture_detach_devices(base, size);
}
if (!primary)
--
2.39.0
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Daniel Vetter <daniel.vetter@intel.com>,
Aaron Plattner <aplattner@nvidia.com>,
Javier Martinez Canillas <javierm@redhat.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Helge Deller <deller@gmx.de>, Sam Ravnborg <sam@ravnborg.org>,
Alex Deucher <alexander.deucher@amd.com>,
stable@vger.kernel.org
Subject: [PATCH 11/11] video/aperture: Only remove sysfb on the default vga pci device
Date: Wed, 11 Jan 2023 16:41:12 +0100 [thread overview]
Message-ID: <20230111154112.90575-11-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20230111154112.90575-1-daniel.vetter@ffwll.ch>
This fixes a regression introduced by ee7a69aa38d8 ("fbdev: Disable
sysfb device registration when removing conflicting FBs"), where we
remove the sysfb when loading a driver for an unrelated pci device,
resulting in the user loosing their efifb console or similar.
Note that in practice this only is a problem with the nvidia blob,
because that's the only gpu driver people might install which does not
come with an fbdev driver of it's own. For everyone else the real gpu
driver will restor a working console.
Also note that in the referenced bug there's confusion that this same
bug also happens on amdgpu. But that was just another amdgpu specific
regression, which just happened to happen at roughly the same time and
with the same user-observable symptons. That bug is fixed now, see
https://bugzilla.kernel.org/show_bug.cgi?id=216331#c15
For the above reasons the cc: stable is just notionally, this patch
will need a backport and that's up to nvidia if they care enough.
References: https://bugzilla.kernel.org/show_bug.cgi?id=216303#c28
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Aaron Plattner <aplattner@nvidia.com>
Cc: Javier Martinez Canillas <javierm@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Helge Deller <deller@gmx.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: <stable@vger.kernel.org> # v5.19+ (if someone else does the backport)
---
drivers/video/aperture.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c
index ba565515480d..a1821d369bb1 100644
--- a/drivers/video/aperture.c
+++ b/drivers/video/aperture.c
@@ -321,15 +321,16 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na
primary = pdev == vga_default_device();
+ if (primary)
+ sysfb_disable();
+
for (bar = 0; bar < PCI_STD_NUM_BARS; ++bar) {
if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
continue;
base = pci_resource_start(pdev, bar);
size = pci_resource_len(pdev, bar);
- ret = aperture_remove_conflicting_devices(base, size, name);
- if (ret)
- return ret;
+ aperture_detach_devices(base, size);
}
if (!primary)
--
2.39.0
next prev parent reply other threads:[~2023-01-11 15:42 UTC|newest]
Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 15:41 [PATCH 01/11] drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-11 15:41 ` [PATCH 02/11] drm/gma500: " Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-12 9:04 ` Thomas Zimmermann
2023-01-12 9:04 ` Thomas Zimmermann
2023-01-12 9:04 ` [Intel-gfx] " Thomas Zimmermann
2023-01-12 9:59 ` Daniel Vetter
2023-01-12 9:59 ` Daniel Vetter
2023-01-12 9:59 ` [Intel-gfx] " Daniel Vetter
2023-01-12 10:24 ` Thomas Zimmermann
2023-01-12 10:24 ` [Intel-gfx] " Thomas Zimmermann
2023-01-12 10:45 ` Daniel Vetter
2023-01-12 10:45 ` Daniel Vetter
2023-01-12 10:45 ` [Intel-gfx] " Daniel Vetter
2023-01-12 12:15 ` Thomas Zimmermann
2023-01-12 12:15 ` [Intel-gfx] " Thomas Zimmermann
2023-01-12 15:32 ` Daniel Vetter
2023-01-12 15:32 ` Daniel Vetter
2023-01-12 15:32 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` [PATCH 03/11] drm/aperture: Remove primary argument Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-11 15:49 ` [Intel-gfx] " Thomas Zimmermann
2023-01-11 15:49 ` Thomas Zimmermann
2023-01-11 15:49 ` Thomas Zimmermann
2023-01-11 15:49 ` Thomas Zimmermann
2023-01-11 15:49 ` Thomas Zimmermann
2023-01-11 15:41 ` [PATCH 04/11] video/aperture: use generic code to figure out the vga default device Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-11 15:59 ` Thomas Zimmermann
2023-01-11 15:59 ` [Intel-gfx] " Thomas Zimmermann
2023-01-11 15:59 ` Thomas Zimmermann
2023-01-11 16:51 ` Daniel Vetter
2023-01-11 16:51 ` [Intel-gfx] " Daniel Vetter
2023-01-11 16:51 ` Daniel Vetter
2023-01-11 15:41 ` [PATCH 05/11] video/aperture: Only kick vgacon when the pdev is decoding vga Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-11 16:03 ` Thomas Zimmermann
2023-01-11 16:03 ` [Intel-gfx] " Thomas Zimmermann
2023-01-11 16:03 ` Thomas Zimmermann
2023-01-11 16:55 ` Daniel Vetter
2023-01-11 16:55 ` [Intel-gfx] " Daniel Vetter
2023-01-11 16:55 ` Daniel Vetter
2023-01-11 15:41 ` [PATCH 06/11] staging/lynxfb: Use pci aperture helper Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-11 16:05 ` Thomas Zimmermann
2023-01-11 16:05 ` Thomas Zimmermann
2023-01-11 16:05 ` [Intel-gfx] " Thomas Zimmermann
2023-01-11 15:41 ` [PATCH 07/11] fbdev/radeon: use pci aperture helpers Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-11 15:41 ` [PATCH 08/11] fbdev/hyperv: " Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-17 18:42 ` Dexuan Cui
2023-01-17 18:42 ` Dexuan Cui
2023-01-11 15:41 ` [PATCH 09/11] video/aperture: Move vga handling to pci function Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-11 15:41 ` [PATCH 10/11] video/aperture: Drop primary argument Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 15:41 ` Daniel Vetter
2023-01-11 16:09 ` Thomas Zimmermann
2023-01-11 16:09 ` [Intel-gfx] " Thomas Zimmermann
2023-01-11 16:09 ` Thomas Zimmermann
2023-01-11 15:41 ` Daniel Vetter [this message]
2023-01-11 15:41 ` [PATCH 11/11] video/aperture: Only remove sysfb on the default vga pci device Daniel Vetter
2023-01-11 15:41 ` [Intel-gfx] " Daniel Vetter
2023-01-11 16:20 ` Thomas Zimmermann
2023-01-11 16:20 ` Thomas Zimmermann
2023-01-11 16:20 ` [Intel-gfx] " Thomas Zimmermann
2023-01-11 16:37 ` Daniel Vetter
2023-01-11 16:37 ` Daniel Vetter
2023-01-11 16:37 ` [Intel-gfx] " Daniel Vetter
2023-01-12 7:48 ` Thomas Zimmermann
2023-01-12 7:48 ` [Intel-gfx] " Thomas Zimmermann
2023-01-11 16:43 ` Javier Martinez Canillas
2023-01-11 16:43 ` [Intel-gfx] " Javier Martinez Canillas
2023-01-11 16:58 ` Javier Martinez Canillas
2023-01-11 16:58 ` Javier Martinez Canillas
2023-01-11 16:58 ` [Intel-gfx] " Javier Martinez Canillas
2023-01-11 19:21 ` Aaron Plattner
2023-01-11 19:21 ` Aaron Plattner
2023-01-11 19:21 ` [Intel-gfx] " Aaron Plattner
2023-01-12 7:55 ` Thomas Zimmermann
2023-01-12 7:55 ` [Intel-gfx] " Thomas Zimmermann
2023-01-12 7:55 ` Thomas Zimmermann
2023-01-12 8:44 ` Javier Martinez Canillas
2023-01-12 8:44 ` Javier Martinez Canillas
2023-01-12 8:44 ` [Intel-gfx] " Javier Martinez Canillas
2023-01-11 15:48 ` [PATCH 01/11] drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers Thomas Zimmermann
2023-01-11 15:48 ` [Intel-gfx] " Thomas Zimmermann
2023-01-11 15:48 ` Thomas Zimmermann
2023-01-11 17:02 ` Daniel Vetter
2023-01-11 17:02 ` Daniel Vetter
2023-01-11 17:02 ` [Intel-gfx] " Daniel Vetter
2023-01-11 16:10 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/11] " Patchwork
2023-01-11 16:38 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-01-12 9:41 ` [PATCH 01/11] " Thomas Zimmermann
2023-01-12 9:41 ` Thomas Zimmermann
2023-01-12 9:41 ` [Intel-gfx] " Thomas Zimmermann
2023-04-04 14:45 ` Thomas Zimmermann
2023-04-04 14:45 ` [Intel-gfx] " Thomas Zimmermann
2023-04-04 14:45 ` Thomas Zimmermann
2023-04-18 0:53 ` Jammy Huang
2023-04-18 0:53 ` [Intel-gfx] " Jammy Huang
2023-04-18 0:53 ` Jammy Huang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230111154112.90575-11-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=alexander.deucher@amd.com \
--cc=aplattner@nvidia.com \
--cc=daniel.vetter@intel.com \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=javierm@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=stable@vger.kernel.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.