gpu: host1x: Rewrite syncpoint interrupt handling

[linux-2.6-microblaze.git] / drivers / gpu / host1x / hw / intr_hw.c

diff --git a/drivers/gpu/host1x/hw/intr_hw.c b/drivers/gpu/host1x/hw/intr_hw.c
index 9acccdb..b915ef7 100644 (file)
--- a/drivers/gpu/host1x/hw/intr_hw.c
+++ b/drivers/gpu/host1x/hw/intr_hw.c
@@ -13,23 +13,6 @@
 #include "../intr.h"
 #include "../dev.h"
 
-/*
- * Sync point threshold interrupt service function
- * Handles sync point threshold triggers, in interrupt context
- */
-static void host1x_intr_syncpt_handle(struct host1x_syncpt *syncpt)
-{
-       unsigned int id = syncpt->id;
-       struct host1x *host = syncpt->host;
-
-       host1x_sync_writel(host, BIT(id % 32),
-               HOST1X_SYNC_SYNCPT_THRESH_INT_DISABLE(id / 32));
-       host1x_sync_writel(host, BIT(id % 32),
-               HOST1X_SYNC_SYNCPT_THRESH_CPU0_INT_STATUS(id / 32));
-
-       schedule_work(&syncpt->intr.work);
-}
-
 static irqreturn_t syncpt_thresh_isr(int irq, void *dev_id)
 {
        struct host1x *host = dev_id;
@@ -39,17 +22,20 @@ static irqreturn_t syncpt_thresh_isr(int irq, void *dev_id)
        for (i = 0; i < DIV_ROUND_UP(host->info->nb_pts, 32); i++) {
                reg = host1x_sync_readl(host,
                        HOST1X_SYNC_SYNCPT_THRESH_CPU0_INT_STATUS(i));
-               for_each_set_bit(id, &reg, 32) {
-                       struct host1x_syncpt *syncpt =
-                               host->syncpt + (i * 32 + id);
-                       host1x_intr_syncpt_handle(syncpt);
-               }
+
+               host1x_sync_writel(host, reg,
+                       HOST1X_SYNC_SYNCPT_THRESH_INT_DISABLE(i));
+               host1x_sync_writel(host, reg,
+                       HOST1X_SYNC_SYNCPT_THRESH_CPU0_INT_STATUS(i));
+
+               for_each_set_bit(id, &reg, 32)
+                       host1x_intr_handle_interrupt(host, i * 32 + id);
        }
 
        return IRQ_HANDLED;
 }
 
-static void _host1x_intr_disable_all_syncpt_intrs(struct host1x *host)
+static void host1x_intr_disable_all_syncpt_intrs(struct host1x *host)
 {
        unsigned int i;
 
@@ -90,45 +76,38 @@ static void intr_hw_init(struct host1x *host, u32 cpm)
 }
 
 static int
-_host1x_intr_init_host_sync(struct host1x *host, u32 cpm,
-                           void (*syncpt_thresh_work)(struct work_struct *))
+host1x_intr_init_host_sync(struct host1x *host, u32 cpm)
 {
-       unsigned int i;
        int err;
 
        host1x_hw_intr_disable_all_syncpt_intrs(host);
 
-       for (i = 0; i < host->info->nb_pts; i++)
-               INIT_WORK(&host->syncpt[i].intr.work, syncpt_thresh_work);
-
-       err = devm_request_irq(host->dev, host->intr_syncpt_irq,
+       err = devm_request_irq(host->dev, host->syncpt_irq,
                               syncpt_thresh_isr, IRQF_SHARED,
                               "host1x_syncpt", host);
-       if (err < 0) {
-               WARN_ON(1);
+       if (err < 0)
                return err;
-       }
 
        intr_hw_init(host, cpm);
 
        return 0;
 }
 
-static void _host1x_intr_set_syncpt_threshold(struct host1x *host,
+static void host1x_intr_set_syncpt_threshold(struct host1x *host,
                                              unsigned int id,
                                              u32 thresh)
 {
        host1x_sync_writel(host, thresh, HOST1X_SYNC_SYNCPT_INT_THRESH(id));
 }
 
-static void _host1x_intr_enable_syncpt_intr(struct host1x *host,
+static void host1x_intr_enable_syncpt_intr(struct host1x *host,
                                            unsigned int id)
 {
        host1x_sync_writel(host, BIT(id % 32),
                HOST1X_SYNC_SYNCPT_THRESH_INT_ENABLE_CPU0(id / 32));
 }
 
-static void _host1x_intr_disable_syncpt_intr(struct host1x *host,
+static void host1x_intr_disable_syncpt_intr(struct host1x *host,
                                             unsigned int id)
 {
        host1x_sync_writel(host, BIT(id % 32),
@@ -137,23 +116,10 @@ static void _host1x_intr_disable_syncpt_intr(struct host1x *host,
                HOST1X_SYNC_SYNCPT_THRESH_CPU0_INT_STATUS(id / 32));
 }
 
-static int _host1x_free_syncpt_irq(struct host1x *host)
-{
-       unsigned int i;
-
-       devm_free_irq(host->dev, host->intr_syncpt_irq, host);
-
-       for (i = 0; i < host->info->nb_pts; i++)
-               cancel_work_sync(&host->syncpt[i].intr.work);
-
-       return 0;
-}
-
 static const struct host1x_intr_ops host1x_intr_ops = {
-       .init_host_sync = _host1x_intr_init_host_sync,
-       .set_syncpt_threshold = _host1x_intr_set_syncpt_threshold,
-       .enable_syncpt_intr = _host1x_intr_enable_syncpt_intr,
-       .disable_syncpt_intr = _host1x_intr_disable_syncpt_intr,
-       .disable_all_syncpt_intrs = _host1x_intr_disable_all_syncpt_intrs,
-       .free_syncpt_irq = _host1x_free_syncpt_irq,
+       .init_host_sync = host1x_intr_init_host_sync,
+       .set_syncpt_threshold = host1x_intr_set_syncpt_threshold,
+       .enable_syncpt_intr = host1x_intr_enable_syncpt_intr,
+       .disable_syncpt_intr = host1x_intr_disable_syncpt_intr,
+       .disable_all_syncpt_intrs = host1x_intr_disable_all_syncpt_intrs,
 };