At 11:04 AM 12/30/2011, Miod Vallat wrote:
> Further to the bug report that I sent using sendbug(1) on the
inteldrm driver,
> here is what I see if I install and boot 5.0 from the release CD
on one of the
> affected Supermicro machines. This is a transcription that I am typing from
> the display, but I will try not to typo anything.
>
> intelagp at vga1 not configured
> inteldrm0 at vga1: apic 4 int 16
> drm0 at inteldrm0: couldn't find agp
> uvm_fault(0xd0a20000, 0x0, 0, 1) -> e
> kernel: page fault trap, code = 0
> Stopped at inteldrm_attach+0x42c: movl 0x28(%eax),%edx
> (now skipping some details, the call tree was:)
> inteldrm_attach
[...]
> Hope this helps,
It does. Can you give the following diff a try?
Miod
Index: drm_drv.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/drm_drv.c,v
retrieving revision 1.96
diff -u -p -r1.96 drm_drv.c
--- drm_drv.c 3 Jul 2011 18:34:14 -0000 1.96
+++ drm_drv.c 30 Dec 2011 19:03:47 -0000
@@ -99,6 +99,7 @@ drm_attach_pci(const struct drm_driver_i
int is_agp, struct device *dev)
{
struct drm_attach_args arg;
+ struct device *drm_dev;
arg.driver = driver;
arg.dmat = pa->pa_dmat;
@@ -115,7 +116,15 @@ drm_attach_pci(const struct drm_driver_i
snprintf(arg.busid, arg.busid_len, "pci:%04x:%02x:%02x.%1x",
pa->pa_domain, pa->pa_bus, pa->pa_device, pa->pa_function);
- return (config_found(dev, &arg, drmprint));
+ drm_dev = config_found(dev, &arg, drmprint);
+ /* force detachment if attachment did not complete successfully */
+ if (drm_dev != NULL &&
+ ((struct drm_device *)drm_dev)->dev_private == NULL) {
+ config_detach(drm_dev, DETACH_FORCE);
+ drm_dev = NULL;
+ }
+
+ return drm_dev;
}
int
Hi Miod,
We finally had time to try this patch, and it does not make any
difference with the problem. We will leave a test machine set up for
a while in case you have any other patches that you would like us to test.
Thanks,
--Bill
