msm: kgsl: Use a consolidated IRQ handler
For some reason while everything else in KGSL was organized into
the kgsl_device hooks the chip specific interrupt handler pointer
was being passed through the device registration function. Make
the IRQ handler work the same way as the other hooks. this reduces
the complexity and reduces the chip specific variables passed into
the generic registration to just one pointer.
Change-Id: Ic0dedbadff1641cbca80593e91744dbb6dcfd2cc
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 87f259d..00dba96 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -169,10 +169,9 @@
};
-static irqreturn_t adreno_isr(int irq, void *data)
+static irqreturn_t adreno_irq_handler(struct kgsl_device *device)
{
irqreturn_t result;
- struct kgsl_device *device = data;
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
result = adreno_dev->gpudev->irq_handler(adreno_dev);
@@ -490,7 +489,7 @@
if (status != 0)
goto error;
- status = kgsl_device_platform_probe(device, adreno_isr);
+ status = kgsl_device_platform_probe(device);
if (status)
goto error_close_rb;
@@ -1444,6 +1443,7 @@
.irqctrl = adreno_irqctrl,
.gpuid = adreno_gpuid,
.snapshot = adreno_snapshot,
+ .irq_handler = adreno_irq_handler,
/* Optional functions */
.setstate = adreno_setstate,
.drawctxt_create = adreno_drawctxt_create,
diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c
index e38037c..321c59e 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -2295,6 +2295,14 @@
return 0;
}
+static irqreturn_t kgsl_irq_handler(int irq, void *data)
+{
+ struct kgsl_device *device = data;
+
+ return device->ftbl->irq_handler(device);
+
+}
+
static const struct file_operations kgsl_fops = {
.owner = THIS_MODULE,
.release = kgsl_release,
@@ -2455,8 +2463,7 @@
}
EXPORT_SYMBOL(kgsl_register_device);
-int kgsl_device_platform_probe(struct kgsl_device *device,
- irqreturn_t (*dev_isr) (int, void*))
+int kgsl_device_platform_probe(struct kgsl_device *device)
{
int result;
int status = -EINVAL;
@@ -2504,7 +2511,7 @@
goto error_release_mem;
}
- status = request_irq(device->pwrctrl.interrupt_num, dev_isr,
+ status = request_irq(device->pwrctrl.interrupt_num, kgsl_irq_handler,
IRQF_TRIGGER_HIGH, device->name, device);
if (status) {
KGSL_DRV_ERR(device, "request_irq(%d) failed: %d\n",
diff --git a/drivers/gpu/msm/kgsl_device.h b/drivers/gpu/msm/kgsl_device.h
index 7d3cfca..b42e606 100644
--- a/drivers/gpu/msm/kgsl_device.h
+++ b/drivers/gpu/msm/kgsl_device.h
@@ -94,6 +94,7 @@
unsigned int (*gpuid)(struct kgsl_device *device);
void * (*snapshot)(struct kgsl_device *device, void *snapshot,
int *remain, int hang);
+ irqreturn_t (*irq_handler)(struct kgsl_device *device);
/* Optional functions - these functions are not mandatory. The
driver will check that the function pointer is not NULL before
calling the hook */
@@ -340,8 +341,8 @@
int kgsl_unregister_ts_notifier(struct kgsl_device *device,
struct notifier_block *nb);
-int kgsl_device_platform_probe(struct kgsl_device *device,
- irqreturn_t (*dev_isr) (int, void*));
+int kgsl_device_platform_probe(struct kgsl_device *device);
+
void kgsl_device_platform_remove(struct kgsl_device *device);
const char *kgsl_pwrstate_to_str(unsigned int state);
diff --git a/drivers/gpu/msm/z180.c b/drivers/gpu/msm/z180.c
index 8c29535..5902361 100644
--- a/drivers/gpu/msm/z180.c
+++ b/drivers/gpu/msm/z180.c
@@ -206,11 +206,10 @@
},
};
-static irqreturn_t z180_isr(int irq, void *data)
+static irqreturn_t z180_irq_handler(struct kgsl_device *device)
{
irqreturn_t result = IRQ_NONE;
unsigned int status;
- struct kgsl_device *device = (struct kgsl_device *) data;
struct z180_device *z180_dev = Z180_DEVICE(device);
z180_regread(device, ADDR_VGC_IRQSTATUS >> 2, &status);
@@ -546,7 +545,7 @@
if (status != 0)
goto error;
- status = kgsl_device_platform_probe(device, z180_isr);
+ status = kgsl_device_platform_probe(device);
if (status)
goto error_close_ringbuffer;
@@ -945,6 +944,7 @@
.power_stats = z180_power_stats,
.irqctrl = z180_irqctrl,
.gpuid = z180_gpuid,
+ .irq_handler = z180_irq_handler,
/* Optional functions */
.drawctxt_create = NULL,
.drawctxt_destroy = z180_drawctxt_destroy,