@@ -110,12 +110,41 @@ resource_size_t mgag200_device_probe_vram(struct mga_device *mdev)
return mgag200_probe_vram(mdev->vram, resource_size(mdev->vram_res));
}
+static irqreturn_t mgag200_driver_irq_handler(int irq, void *arg)
+{
+ struct mga_device *mdev = (struct mga_device *) arg;
+ u32 status;
+
+ status = RREG32(MGAREG_STATUS);
+
+ if (status & MGAIRQ_SOFTRAP) {
+ WREG32(MGAREG_ICLEAR, MGAIRQ_SOFTRAP);
+ return IRQ_HANDLED;
+ }
+ return IRQ_NONE;
+}
+
+static void mgag200_init_irq(struct mga_device *mdev)
+{
+ /* Disable *all* interrupts */
+ WREG32(MGAREG_IEN, 0);
+ /* Clear bits if they're already high */
+ WREG32(MGAREG_ICLEAR, 0xf);
+}
+
+static void mgag200_enable_irq(struct mga_device *mdev)
+{
+ /* Enable only Softrap IRQ */
+ WREG32(MGAREG_IEN, MGAIRQ_SOFTRAP);
+}
+
int mgag200_device_preinit(struct mga_device *mdev)
{
struct drm_device *dev = &mdev->base;
struct pci_dev *pdev = to_pci_dev(dev->dev);
resource_size_t start, len;
struct resource *res;
+ int ret;
/* BAR 1 contains registers */
@@ -153,6 +182,13 @@ int mgag200_device_preinit(struct mga_device *mdev)
if (!mdev->vram)
return -ENOMEM;
+ mgag200_init_irq(mdev);
+ ret = devm_request_irq(dev->dev, pdev->irq, mgag200_driver_irq_handler,
+ IRQF_SHARED, "mgag200_irq", mdev);
+ if (ret < 0) {
+ drm_err(dev, "devm_request_irq(VRAM) failed %d\n", ret);
+ return -ENXIO;
+ }
return 0;
}
@@ -184,6 +220,8 @@ int mgag200_device_init(struct mga_device *mdev,
MGAREG_MISC_HIGH_PG_SEL;
WREG8(MGA_MISC_OUT, misc);
+ mgag200_enable_irq(mdev);
+
mutex_unlock(&mdev->rmmio_lock);
return 0;
@@ -107,6 +107,9 @@
#define MGAREG_ICLEAR 0x1e18
#define MGAREG_IEN 0x1e1c
+/* same bit shift for MGAREG_IEN, MGAREG_ICLEAR and MGAREG_STATUS */
+#define MGAIRQ_SOFTRAP BIT(0)
+
#define MGAREG_VCOUNT 0x1e20
#define MGAREG_Reset 0x1e40
Register irq, and enable the softrap irq. This patch has no functional impact since softrap irq can't be triggered without DMA. Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com> --- drivers/gpu/drm/mgag200/mgag200_drv.c | 38 +++++++++++++++++++++++++++ drivers/gpu/drm/mgag200/mgag200_reg.h | 3 +++ 2 files changed, 41 insertions(+)