mc: handle irq-related setup ourselves

We need to be able to process interrupts before the DRM code is able to
actually enable them, set it up ourselves.  Also, it's less convoluted
to *not* use the DRM wrappers it appears...

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

2 files changed, 59 insertions, 7 deletions

diff --git a/lib/core/os.h b/lib/core/os.h
index d12728813..fc83cdf3d 100644
--- a/lib/core/os.h
+++ b/lib/core/os.h
@@ -271,6 +271,25 @@ nvos_backtrace(void)
 #define WARN_ON(c) (c)
 
 /******************************************************************************
+ * interrupts
+ *****************************************************************************/
+#define IRQF_SHARED 0
+
+typedef enum irqreturn {
+	IRQ_NONE,
+	IRQ_HANDLED
+} irqreturn_t;
+
+typedef irqreturn_t (*irq_handler_t)(int, void *);
+
+extern int  os_intr_init(unsigned int, irq_handler_t, unsigned long,
+			 const char *, void *);
+extern void os_intr_free(unsigned int, void *);
+
+#define request_irq os_intr_init
+#define free_irq os_intr_free
+
+/******************************************************************************
  * spinlocks - using pthread mutex due to no static spinlock initialiser
  *****************************************************************************/
 #include <pthread.h>
@@ -419,6 +438,7 @@ struct pci_dev {
 	u16 device;
 	u16 subsystem_vendor;
 	u16 subsystem_device;
+	int irq;
 };
 
 static inline int
diff --git a/lib/main.c b/lib/main.c
index 78d5b9906..9caf60448 100644
--- a/lib/main.c
+++ b/lib/main.c
@@ -56,19 +56,51 @@ static int os_client_id = 0;
  *****************************************************************************/
 #define INTR_FREQ 10000
 
+struct os_intr {
+	struct list_head head;
+	irq_handler_t handler;
+	int irq;
+	void *dev;
+};
+static LIST_HEAD(os_intr_list);
+
+int
+os_intr_init(unsigned int irq, irq_handler_t handler, unsigned long flags,
+	     const char *name, void *dev)
+{
+	struct os_intr *intr = malloc(sizeof(*intr));
+	if (!intr)
+		return -ENOMEM;
+	intr->handler = handler;
+	intr->irq = irq;
+	intr->dev = dev;
+	list_add(&intr->head, &os_intr_list);
+	return 0;
+}
+
+void
+os_intr_free(unsigned int irq, void *dev)
+{
+	struct os_intr *intr;
+
+	list_for_each_entry(intr, &os_intr_list, head) {
+		if (intr->irq == irq && intr->dev == dev) {
+			list_del(&intr->head);
+			free(intr);
+			break;
+		}
+	}
+}
+
 static void
 os_intr(int signal)
 {
-	struct nouveau_subdev *pmc;
-	struct os_device *odev;
+	struct os_intr *intr;
 
-	list_for_each_entry(odev, &os_device_list, head) {
-		pmc = nouveau_subdev(odev, NVDEV_SUBDEV_MC);
-		if (pmc && pmc->intr)
-			pmc->intr(pmc);
+	list_for_each_entry(intr, &os_intr_list, head) {
+		intr->handler(intr->irq, intr->dev);
 	}
 
-
 	ualarm(INTR_FREQ, 0);
 }