diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c index 502ff91..c034f9b 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c @@ -11325,6 +11325,7 @@ void i915_disable_vga(struct drm_device *dev) u8 sr1; u32 vga_reg = i915_vgacntrl_reg(dev); +aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__); #ifdef __NetBSD__ { const bus_addr_t vgabase = 0x3c0; @@ -11441,19 +11442,22 @@ void intel_modeset_init(struct drm_device *dev) i915_disable_vga(dev); #endif intel_setup_outputs(dev); +aprint_normal( "%s: %s:%d\n",__func__, __FILE__,__LINE__); /* Just in case the BIOS is doing something questionable. */ intel_disable_fbc(dev); - + /* OK */ +aprint_normal( "%s: %s:%d\n",__func__, __FILE__,__LINE__); mutex_lock(&dev->mode_config.mutex); intel_modeset_setup_hw_state(dev, false); mutex_unlock(&dev->mode_config.mutex); +aprint_normal( "%s: %s:%d\n",__func__, __FILE__,__LINE__); list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head) { if (!crtc->active) continue; - + while (1) { }; /* * Note that reserving the BIOS fb up front prevents us * from stuffing other stolen allocations like the ring @@ -11471,6 +11475,7 @@ void intel_modeset_init(struct drm_device *dev) intel_find_plane_obj(crtc, &crtc->plane_config); } } + while (1) { }; } static void intel_enable_pipe_a(struct drm_device *dev) @@ -11673,7 +11678,9 @@ void i915_redisable_vga_power_on(struct drm_device *dev) if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) { DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n"); +aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__); i915_disable_vga(dev); +aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__); } } diff --git a/sys/external/bsd/drm2/i915drm/i915_pci.c b/sys/external/bsd/drm2/i915drm/i915_pci.c index 3ba85bc..c772e95 100644 --- a/sys/external/bsd/drm2/i915drm/i915_pci.c +++ b/sys/external/bsd/drm2/i915drm/i915_pci.c @@ -111,7 +111,7 @@ i915drmkms_pci_lookup(const struct pci_attach_args *pa) printf("i915drmkms: preliminary hardware support disabled\n"); return NULL; } - +aprint_normal( "%s: %s:%d\n",__func__, __FILE__,__LINE__); return info; } @@ -129,6 +129,7 @@ i915drmkms_match(device_t parent, cfdata_t match, void *aux) } if (i915drmkms_pci_lookup(pa) == NULL) + /* OK XXX */ return 0; return 6; /* XXX Beat genfb_pci... */ @@ -153,6 +154,7 @@ i915drmkms_attach(device_t parent, device_t self, void *aux) if (!pmf_device_register(self, &i915drmkms_suspend, &i915drmkms_resume)) aprint_error_dev(self, "unable to establish power handler\n"); + /* OK XXX */ sc->sc_task_state = I915DRMKMS_TASK_ATTACH; SIMPLEQ_INIT(&sc->sc_task_u.attach); @@ -160,6 +162,8 @@ i915drmkms_attach(device_t parent, device_t self, void *aux) /* XXX errno Linux->NetBSD */ error = -drm_pci_attach(self, pa, &sc->sc_pci_dev, i915_drm_driver, cookie, &sc->sc_drm_dev); +aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__); + if (error) { aprint_error_dev(self, "unable to attach drm: %d\n", error); return; @@ -168,11 +172,12 @@ i915drmkms_attach(device_t parent, device_t self, void *aux) while (!SIMPLEQ_EMPTY(&sc->sc_task_u.attach)) { struct i915drmkms_task *const task = SIMPLEQ_FIRST(&sc->sc_task_u.attach); - +aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__); SIMPLEQ_REMOVE_HEAD(&sc->sc_task_u.attach, ift_u.queue); (*task->ift_fn)(task); } - +aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__); +/* BAD XXXX */ sc->sc_task_state = I915DRMKMS_TASK_WORKQUEUE; error = workqueue_create(&sc->sc_task_u.workqueue, "intelfb", &i915drmkms_task_work, NULL, PRI_NONE, IPL_NONE, WQ_MPSAFE);