diff --git a/sys/arch/x86/pci/pci_intr_machdep.c b/sys/arch/x86/pci/pci_intr_machdep.c index c79044a4126..82dfc007fb4 100644 --- a/sys/arch/x86/pci/pci_intr_machdep.c +++ b/sys/arch/x86/pci/pci_intr_machdep.c @@ -225,6 +225,7 @@ pci_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih, char *buf, size_t len) { pci_chipset_tag_t ipc; + aprint_normal(" %s: %04d : %s\n", __FILE__,__LINE__,__FUNCTION__); for (ipc = pc; ipc != NULL; ipc = ipc->pc_super) { if ((ipc->pc_present & PCI_OVERRIDE_INTR_STRING) == 0) diff --git a/sys/arch/x86/x86/ioapic.c b/sys/arch/x86/x86/ioapic.c index 35e3db0f183..c71cc85f732 100644 --- a/sys/arch/x86/x86/ioapic.c +++ b/sys/arch/x86/x86/ioapic.c @@ -494,6 +494,7 @@ ioapic_reenable(void) apic_set_redir(sc, p, sc->sc_pins[p].ip_vector, sc->sc_pins[p].ip_cpu); } + aprint_normal("%s reenabling done ..\n", device_xname(ioapics->sc_dev)); ioapic_enable(); } diff --git a/sys/external/bsd/drm2/dist/drm/drm_irq.c b/sys/external/bsd/drm2/dist/drm/drm_irq.c index cf69816a9ec..04c4596ba67 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_irq.c +++ b/sys/external/bsd/drm2/dist/drm/drm_irq.c @@ -308,6 +308,7 @@ int drm_irq_install(struct drm_device *dev) int ret; unsigned long sh_flags = 0; const char *irqname; +aprint_normal("%s:%04d: %s\n", __FILE__, __LINE__, __FUNCTION__); if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) return -EINVAL; @@ -315,6 +316,7 @@ int drm_irq_install(struct drm_device *dev) if (drm_dev_to_irq(dev) == 0) return -EINVAL; +aprint_normal("%s:%04d: %s\n", __FILE__, __LINE__, __FUNCTION__); mutex_lock(&dev->struct_mutex); /* Driver must have been initialized */ @@ -323,10 +325,12 @@ int drm_irq_install(struct drm_device *dev) return -EINVAL; } +aprint_normal("%s:%04d: %s\n", __FILE__, __LINE__, __FUNCTION__); if (dev->irq_enabled) { mutex_unlock(&dev->struct_mutex); return -EBUSY; } +aprint_normal("%s:%04d: %s\n", __FILE__, __LINE__, __FUNCTION__); dev->irq_enabled = true; mutex_unlock(&dev->struct_mutex); diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c b/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c index 41d89e06ff5..e61e34cdadf 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c @@ -3271,9 +3271,11 @@ static void valleyview_disable_rps(struct drm_device *dev) gen6_disable_rps_interrupts(dev); } +int sequence = 0; static void intel_print_rc6_info(struct drm_device *dev, u32 mode) { - DRM_INFO("Enabling RC6 states: RC6 %s, RC6p %s, RC6pp %s\n", + DRM_INFO("seq: %d, .. Enabling RC6 states: RC6 %s, RC6p %s, RC6pp %s\n", + sequence++, (mode & GEN6_RC_CTL_RC6_ENABLE) ? "on" : "off", (mode & GEN6_RC_CTL_RC6p_ENABLE) ? "on" : "off", (mode & GEN6_RC_CTL_RC6pp_ENABLE) ? "on" : "off"); @@ -3341,7 +3343,9 @@ static void gen8_enable_rps(struct drm_device *dev) /* 3: Enable RC6 */ if (intel_enable_rc6(dev) & INTEL_RC6_ENABLE) rc6_mask = GEN6_RC_CTL_RC6_ENABLE; + intel_print_rc6_info(dev, rc6_mask); + I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE | GEN6_RC_CTL_EI_MODE(1) | rc6_mask); diff --git a/sys/external/bsd/drm2/pci/drm_pci.c b/sys/external/bsd/drm2/pci/drm_pci.c index 9f3729e33dd..924f5817827 100644 --- a/sys/external/bsd/drm2/pci/drm_pci.c +++ b/sys/external/bsd/drm2/pci/drm_pci.c @@ -239,21 +239,28 @@ drm_pci_irq_install(struct drm_device *dev, irqreturn_t (*handler)(void *), const char *intrstr; char intrbuf[PCI_INTRSTR_LEN]; struct drm_bus_irq_cookie *irq_cookie; + aprint_error_dev(dev->dev, "%s: %04d: %s\n", __FILE__, __LINE__, __FUNCTION__); irq_cookie = kmem_alloc(sizeof(*irq_cookie), KM_SLEEP); + aprint_error_dev(dev->dev, "%s: %04d: %s\n", __FILE__, __LINE__, __FUNCTION__); if (dev->pdev->msi_enabled) { + aprint_error_dev(dev->dev, "%s: %04d: %s\n", __FILE__, __LINE__, __FUNCTION__); irq_cookie->intr_handles = dev->pdev->intr_handles; dev->pdev->intr_handles = NULL; } else { + aprint_error_dev(dev->dev, "%s: %04d: %s\n", __FILE__, __LINE__, __FUNCTION__); if (pci_intx_alloc(pa, &irq_cookie->intr_handles)) return -ENOENT; } + aprint_error_dev(dev->dev, "%s: %04d: %s\n", __FILE__, __LINE__, __FUNCTION__); intrstr = pci_intr_string(pa->pa_pc, irq_cookie->intr_handles[0], intrbuf, sizeof(intrbuf)); + aprint_error_dev(dev->dev, "%s: %04d: %s\n", __FILE__, __LINE__, __FUNCTION__); irq_cookie->ih_cookie = pci_intr_establish_xname(pa->pa_pc, irq_cookie->intr_handles[0], IPL_DRM, handler, arg, name); + aprint_error_dev(dev->dev, "%s: %04d: %s\n", __FILE__, __LINE__, __FUNCTION__); if (irq_cookie->ih_cookie == NULL) { aprint_error_dev(dev->dev, "couldn't establish interrupt at %s (%s)\n", intrstr, name);