[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20151003093538.GA3786@pd.tnic>
Date: Sat, 3 Oct 2015 11:35:38 +0200
From: Borislav Petkov <bp@...en8.de>
To: Jiang Liu <jiang.liu@...ux.intel.com>
Cc: Joerg Roedel <joro@...tes.org>, Daniel Vetter <daniel@...ll.ch>,
Thomas Gleixner <tglx@...utronix.de>,
Bjorn Helgaas <bhelgaas@...gle.com>,
Alex Deucher <alexdeucher@...il.com>,
Alex Deucher <alexander.deucher@....com>,
Christian König <christian.koenig@....com>,
Maling list - DRI developers
<dri-devel@...ts.freedesktop.org>,
lkml <linux-kernel@...r.kernel.org>
Subject: Re: WARNING: CPU: 4 PID: 863 at include/drm/drm_crtc.h:1577
drm_helper_choose_encoder_dpms+0x88/0x90() - evildoer found and neutralized
On Sat, Oct 03, 2015 at 03:36:35PM +0800, Jiang Liu wrote:
> The above change is not needed, pcibios_disable_irq() will
> first check !pci_has_managed_irq(dev) before actually freeing
> PCI irq. pci_has_managed_irq(dev) only returns true if
> pcibios_alloc_irq() succeeds.
>
> So to summary, I think we only need following change to fix the
> regression:
> int pcibios_alloc_irq(struct pci_dev *dev)
> {
> + if (pci_dev_msi_enabled(dev))
> + return -EBUSY;
>
> What do you think?
Yap, that works too. I've got only this ontop of 4.3+tip:
---
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index dc78a4a9a466..a4687aa6c1fb 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -675,6 +675,9 @@ int pcibios_add_device(struct pci_dev *dev)
int pcibios_alloc_irq(struct pci_dev *dev)
{
+ if (pci_dev_msi_enabled(dev))
+ return -EBUSY;
+
return pcibios_enable_irq(dev);
}
---
and it suspend+resumed fine.
I guess it is time for Joerg to write a proper patch. :-)
Thanks.
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists