Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 50c5003295ca..7f73bacf13ed 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1206,6 +1206,16 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
         if (flags & PCI_IRQ_AFFINITY) {
                 if (!affd)
                         affd = &msi_default_affd;
+
+                if (affd->pre_vectors + affd->post_vectors > min_vecs)
+                        return -EINVAL;
+
+                /*
+                 * If there aren't any vectors left after applying the pre/post
+                 * vectors don't bother with assigning affinity.
+                 */
+                if (affd->pre_vectors + affd->post_vectors == min_vecs)
+                        affd = NULL;
         } else {
                 if (WARN_ON(affd))
                         affd = NULL;