agpgart: Reprobe VGA devices when a new GART device is added
PATCH 1/1 agpgart: Reprobe VGA devices when a new GART device is added
This addresses <http://bugzilla.kernel.org/show_bug.cgi?id=15021>.
DRM drivers may fail to probe their devices when the associated AGP GART does not yet have a driver, so we reprobe unbound VGA devices when a GART device is added.
---
This is intended to address the dependency problem highlighted in the above bug report. That specific bug can be fixed by adding a module dependency from i915 to intel_agp, but in general there is no fixed relationship betweem DRM and GART drivers.
There is a narrow race between the check for a current driver binding and the call to device_reprobe(). This could be closed by adding a variant on device_attach() and device_reprobe() that is a no-op for bound devices.
Ben.
drivers/char/agp/backend.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-)
drivers/char/agp/backend.c +20 -0
@@ -36,6 +36,7 @@#include <linux/agp_backend.h> #include <linux/agpgart.h> #include <linux/vmalloc.h> +#include <linux/workqueue.h> #include <asm/io.h> #include "agp.h"
@@ -281,6 +282,24 @@ void agp_put_bridge(struct agp_bridge_data *bridge)EXPORT_SYMBOL (agp_put_bridge); +/* +* DRM drivers may fail to probe their devices when the associated AGP +* GART does not yet have a driver, so we reprobe unbound VGA devices +* when a GART device is added. This problem applies not only to true +* AGP devices which would be children of the affected bridge, but +* also to PCI Express devices that may be siblings of the GART +* device. Therefore iterate over all PCI VGA devices. +*/ +static void agp_probe_video (struct work_struct *work) +{ +struct pci_dev *pdev =NULL ; + +while ((pdev =pci_get_class (0x030000 , pdev)) !=NULL ) { +if (!pdev->dev.driver &&device_reprobe (&pdev->dev)) +pr_err (PFX "failed to reprobe %s\n" ,pci_name (pdev)); +} +static DECLARE_WORK(agp_probe_video_work, agp_probe_video); +int agp_add_bridge (struct agp_bridge_data *bridge) {int error;
@@ -324,6 +343,7 @@ int agp_add_bridge(struct agp_bridge_data *bridge) }list_add (&bridge->list, &agp_bridges); +schedule_work (&agp_probe_video_work);return 0 ; frontend_err:
Signature · 1 line
1.6.6.2
drivers/char/agp/backend.c void agp_put_bridge(struct agp_bridge_data *bridge) · line 297
Quoted 5 lines · Ben Hutchings
drivers/char/agp/backend.c +5
-0+static void agp_probe_video (struct work_struct *work) +{ +struct pci_dev *pdev =NULL ; + +while ((pdev =pci_get_class (0x030000 , pdev)) !=NULL ) {
Only without the opening brace here...
Ben.
Quoted 3 lines
drivers/char/agp/backend.c +3
-0+if (!pdev->dev.driver &&device_reprobe (&pdev->dev)) +pr_err (PFX "failed to reprobe %s\n" ,pci_name (pdev)); +}
Signature · 3 lines
Ben Hutchings
Horngren's Observation:
Among economists, the real world is often a special case.Quoted 13 lines · Ben Hutchings
This addresses <http://bugzilla.kernel.org/show_bug.cgi?id=15021>.
DRM drivers may fail to probe their devices when the associated AGP GART does not yet have a driver, so we reprobe unbound VGA devices when a GART device is added.
Signed-off-by Ben Hutchings <[email protected]>---
This is intended to address the dependency problem highlighted in the above bug report. That specific bug can be fixed by adding a module dependency from i915 tointel_agp, but in general there is no fixed relationship betweem DRM and GART drivers.
Quoted 5 lines
There is a narrow race between the check for a current driver binding and the call to
device_reprobe(). This could be closed by adding a variant ondevice_attach()anddevice_reprobe()that is a no-op for bound devices.
This isn't useful, generally there is no AGP binding, and most drivers if they can't find an AGP backend will still run fine without it. i.e. radeon, mga etc.
Intel is a special case and I think we've already merged an explicit depend.
Just build agp drivers into the kernel, I'm tempted to make them all non-modular.
Dave.
Quoted 24 lines · Dave Airlie
Quoted 13 lines · Ben Hutchings
This addresses <http://bugzilla.kernel.org/show_bug.cgi?id=15021>.
DRM drivers may fail to probe their devices when the associated AGP GART does not yet have a driver, so we reprobe unbound VGA devices when a GART device is added.
Signed-off-by Ben Hutchings <[email protected]>---
This is intended to address the dependency problem highlighted in the above bug report. That specific bug can be fixed by adding a module dependency from i915 tointel_agp, but in general there is no fixed relationship betweem DRM and GART drivers.Quoted 5 lines
There is a narrow race between the check for a current driver binding and the call to
device_reprobe(). This could be closed by adding a variant ondevice_attach()anddevice_reprobe()that is a no-op for bound devices.This isn't useful, generally there is no AGP binding, and most drivers if they can't find an AGP backend will still run fine without it. i.e. radeon, mga etc.
Quoted 5 lines
Intel is a special case and I think we've already merged an explicit depend.
Just build agp drivers into the kernel, I'm tempted to make them all non-modular.
That seems easier.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel
Quoted 21 lines · Eric Anholt
Quoted 20 lines · Dave Airlie
Quoted 18 lines · Ben Hutchings
This addresses <http://bugzilla.kernel.org/show_bug.cgi?id=15021>.
DRM drivers may fail to probe their devices when the associated AGP GART does not yet have a driver, so we reprobe unbound VGA devices when a GART device is added.
Signed-off-by Ben Hutchings <[email protected]>---
This is intended to address the dependency problem highlighted in the above bug report. That specific bug can be fixed by adding a module dependency from i915 tointel_agp, but in general there is no fixed relationship betweem DRM and GART drivers.There is a narrow race between the check for a current driver binding and the call to
device_reprobe(). This could be closed by adding a variant ondevice_attach()anddevice_reprobe()that is a no-op for bound devices.
Quoted 3 lines
Quoted 3 lines
This isn't useful, generally there is no AGP binding, and most drivers if they can't find an AGP backend will still run fine without it. i.e. radeon, mga etc.
I see, only the Intel GPU drivers set DRIVER_REQUIRE_AGP.
Quoted 7 lines
Quoted 5 lines
Intel is a special case and I think we've already merged an explicit depend.
Just build agp drivers into the kernel, I'm tempted to make them all non-modular.
That seems easier.
Easier, yes, but it's a fair amount of bloat for i386 kernels (less so for x86-64) since there are many different GART drivers. I was hoping to avoid that.
Ben.
Signature · 3 lines
Ben Hutchings Life is like a sewer: what you get out of it depends on what you put into it.