From: zourongrong@gmail.com (Rongrong Zou) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 8/9] drm/hisilicon/hibmc: Add vblank interruput Date: Fri, 28 Oct 2016 15:28:01 +0800 [thread overview] Message-ID: <1477639682-22520-9-git-send-email-zourongrong@gmail.com> (raw) In-Reply-To: <1477639682-22520-1-git-send-email-zourongrong@gmail.com> Add vblank interrupt. Signed-off-by: Rongrong Zou <zourongrong@gmail.com> --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 56 ++++++++++++++++++++++++- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 + 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c index 4253603..b668e3e 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c @@ -40,16 +40,46 @@ static int hibmc_enable_vblank(struct drm_device *dev, unsigned int pipe) { + struct hibmc_drm_device *hidev = + (struct hibmc_drm_device *)dev->dev_private; + + writel(HIBMC_RAW_INTERRUPT_EN_VBLANK(1), + hidev->mmio + HIBMC_RAW_INTERRUPT_EN); + return 0; } static void hibmc_disable_vblank(struct drm_device *dev, unsigned int pipe) { + struct hibmc_drm_device *hidev = + (struct hibmc_drm_device *)dev->dev_private; + + writel(HIBMC_RAW_INTERRUPT_EN_VBLANK(0), + hidev->mmio + HIBMC_RAW_INTERRUPT_EN); +} + +irqreturn_t hibmc_drm_interrupt(int irq, void *arg) +{ + struct drm_device *dev = (struct drm_device *)arg; + struct hibmc_drm_device *hidev = + (struct hibmc_drm_device *)dev->dev_private; + struct drm_crtc *crtc = &hidev->crtc; + u32 status; + + status = readl(hidev->mmio + HIBMC_RAW_INTERRUPT); + + if (status & HIBMC_RAW_INTERRUPT_VBLANK(1)) { + writel(HIBMC_RAW_INTERRUPT_VBLANK(1), + hidev->mmio + HIBMC_RAW_INTERRUPT); + drm_crtc_handle_vblank(crtc); + } + + return IRQ_HANDLED; } static struct drm_driver hibmc_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | - DRIVER_ATOMIC, + DRIVER_ATOMIC | DRIVER_HAVE_IRQ, .fops = &hibmc_fops, .name = "hibmc", .date = "20160828", @@ -63,6 +93,7 @@ static void hibmc_disable_vblank(struct drm_device *dev, unsigned int pipe) .dumb_create = hibmc_dumb_create, .dumb_map_offset = hibmc_dumb_mmap_offset, .dumb_destroy = drm_gem_dumb_destroy, + .irq_handler = hibmc_drm_interrupt, }; static int hibmc_pm_suspend(struct device *dev) @@ -242,6 +273,13 @@ static int hibmc_unload(struct drm_device *dev) struct hibmc_drm_device *hidev = dev->dev_private; hibmc_fbdev_fini(hidev); + + if (dev->irq_enabled) + drm_irq_uninstall(dev); + if (hidev->msi_enabled) + pci_disable_msi(dev->pdev); + drm_vblank_cleanup(dev); + hibmc_kms_fini(hidev); hibmc_mm_fini(hidev); hibmc_hw_fini(hidev); @@ -272,6 +310,22 @@ static int hibmc_load(struct drm_device *dev, unsigned long flags) if (ret) goto err; + ret = drm_vblank_init(dev, dev->mode_config.num_crtc); + if (ret) { + DRM_ERROR("failed to initialize vblank.\n"); + goto err; + } + + hidev->msi_enabled = 0; + if (pci_enable_msi(dev->pdev)) { + DRM_ERROR("Enabling MSI failed!\n"); + } else { + hidev->msi_enabled = 1; + ret = drm_irq_install(dev, dev->pdev->irq); + if (ret) + DRM_ERROR("install irq failed , ret = %d\n", ret); + } + /* reset all the states of crtc/plane/encoder/connector */ drm_mode_config_reset(dev); diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h index 450247d..f1706fb 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h @@ -42,6 +42,7 @@ struct hibmc_drm_device { void __iomem *fb_map; unsigned long fb_base; unsigned long fb_size; + int msi_enabled; /* drm */ struct drm_device *dev; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Rongrong Zou <zourongrong@gmail.com> To: airlied@linux.ie, daniel@ffwll.ch, dri-devel@lists.freedesktop.org, emil.l.velikov@gmail.com, tomeu.vizoso@collabora.com, benjamin.gaignard@linaro.org, robh@kernel.org, daniel@fooishbar.org, architt@codeaurora.org, corbet@lwn.net, catalin.marinas@arm.com, will.deacon@arm.com, mark.rutland@arm.com, xinliang.liu@linaro.org Cc: linuxarm@huawei.com, kong.kongxinwei@hisilicon.com, james.xiong@huawei.com, shenhui@huawei.com, guohanjun@huawei.com, lijianhua@huawei.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 8/9] drm/hisilicon/hibmc: Add vblank interruput Date: Fri, 28 Oct 2016 15:28:01 +0800 [thread overview] Message-ID: <1477639682-22520-9-git-send-email-zourongrong@gmail.com> (raw) In-Reply-To: <1477639682-22520-1-git-send-email-zourongrong@gmail.com> Add vblank interrupt. Signed-off-by: Rongrong Zou <zourongrong@gmail.com> --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 56 ++++++++++++++++++++++++- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 + 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c index 4253603..b668e3e 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c @@ -40,16 +40,46 @@ static int hibmc_enable_vblank(struct drm_device *dev, unsigned int pipe) { + struct hibmc_drm_device *hidev = + (struct hibmc_drm_device *)dev->dev_private; + + writel(HIBMC_RAW_INTERRUPT_EN_VBLANK(1), + hidev->mmio + HIBMC_RAW_INTERRUPT_EN); + return 0; } static void hibmc_disable_vblank(struct drm_device *dev, unsigned int pipe) { + struct hibmc_drm_device *hidev = + (struct hibmc_drm_device *)dev->dev_private; + + writel(HIBMC_RAW_INTERRUPT_EN_VBLANK(0), + hidev->mmio + HIBMC_RAW_INTERRUPT_EN); +} + +irqreturn_t hibmc_drm_interrupt(int irq, void *arg) +{ + struct drm_device *dev = (struct drm_device *)arg; + struct hibmc_drm_device *hidev = + (struct hibmc_drm_device *)dev->dev_private; + struct drm_crtc *crtc = &hidev->crtc; + u32 status; + + status = readl(hidev->mmio + HIBMC_RAW_INTERRUPT); + + if (status & HIBMC_RAW_INTERRUPT_VBLANK(1)) { + writel(HIBMC_RAW_INTERRUPT_VBLANK(1), + hidev->mmio + HIBMC_RAW_INTERRUPT); + drm_crtc_handle_vblank(crtc); + } + + return IRQ_HANDLED; } static struct drm_driver hibmc_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | - DRIVER_ATOMIC, + DRIVER_ATOMIC | DRIVER_HAVE_IRQ, .fops = &hibmc_fops, .name = "hibmc", .date = "20160828", @@ -63,6 +93,7 @@ static void hibmc_disable_vblank(struct drm_device *dev, unsigned int pipe) .dumb_create = hibmc_dumb_create, .dumb_map_offset = hibmc_dumb_mmap_offset, .dumb_destroy = drm_gem_dumb_destroy, + .irq_handler = hibmc_drm_interrupt, }; static int hibmc_pm_suspend(struct device *dev) @@ -242,6 +273,13 @@ static int hibmc_unload(struct drm_device *dev) struct hibmc_drm_device *hidev = dev->dev_private; hibmc_fbdev_fini(hidev); + + if (dev->irq_enabled) + drm_irq_uninstall(dev); + if (hidev->msi_enabled) + pci_disable_msi(dev->pdev); + drm_vblank_cleanup(dev); + hibmc_kms_fini(hidev); hibmc_mm_fini(hidev); hibmc_hw_fini(hidev); @@ -272,6 +310,22 @@ static int hibmc_load(struct drm_device *dev, unsigned long flags) if (ret) goto err; + ret = drm_vblank_init(dev, dev->mode_config.num_crtc); + if (ret) { + DRM_ERROR("failed to initialize vblank.\n"); + goto err; + } + + hidev->msi_enabled = 0; + if (pci_enable_msi(dev->pdev)) { + DRM_ERROR("Enabling MSI failed!\n"); + } else { + hidev->msi_enabled = 1; + ret = drm_irq_install(dev, dev->pdev->irq); + if (ret) + DRM_ERROR("install irq failed , ret = %d\n", ret); + } + /* reset all the states of crtc/plane/encoder/connector */ drm_mode_config_reset(dev); diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h index 450247d..f1706fb 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h @@ -42,6 +42,7 @@ struct hibmc_drm_device { void __iomem *fb_map; unsigned long fb_base; unsigned long fb_size; + int msi_enabled; /* drm */ struct drm_device *dev; -- 1.9.1
next prev parent reply other threads:[~2016-10-28 7:28 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-28 7:27 [PATCH v6 0/9] Add DRM driver for Hisilicon Hibmc Rongrong Zou 2016-10-28 7:27 ` Rongrong Zou 2016-10-28 7:27 ` [PATCH v6 1/9] drm/hisilicon/hibmc: Add hisilicon hibmc drm master driver Rongrong Zou 2016-10-28 7:27 ` Rongrong Zou 2016-11-10 17:35 ` Sean Paul 2016-11-10 17:35 ` Sean Paul 2016-11-11 3:10 ` Rongrong Zou 2016-11-11 3:10 ` Rongrong Zou 2016-10-28 7:27 ` [PATCH v6 2/9] drm/hisilicon/hibmc: Add video memory management Rongrong Zou 2016-10-28 7:27 ` Rongrong Zou 2016-11-10 17:35 ` Sean Paul 2016-11-10 17:35 ` Sean Paul 2016-11-11 11:16 ` Rongrong Zou 2016-11-11 11:16 ` Rongrong Zou 2016-11-11 13:25 ` Sean Paul 2016-11-11 13:25 ` Sean Paul 2016-11-11 13:57 ` Rongrong Zou 2016-11-11 13:57 ` Rongrong Zou 2016-10-28 7:27 ` [PATCH v6 3/9] drm/hisilicon/hibmc: Add support for frame buffer Rongrong Zou 2016-10-28 7:27 ` Rongrong Zou 2016-11-10 18:30 ` Sean Paul 2016-11-10 18:30 ` Sean Paul 2016-11-11 13:16 ` Rongrong Zou 2016-11-11 13:16 ` Rongrong Zou 2016-11-11 13:27 ` Sean Paul 2016-11-11 13:27 ` Sean Paul 2016-10-28 7:27 ` [PATCH v6 4/9] drm/hisilicon/hibmc: Add plane for DE Rongrong Zou 2016-10-28 7:27 ` Rongrong Zou 2016-11-10 21:53 ` Sean Paul 2016-11-10 21:53 ` Sean Paul 2016-11-12 5:11 ` Rongrong Zou 2016-11-12 5:11 ` Rongrong Zou 2016-11-14 17:08 ` Sean Paul 2016-11-14 17:08 ` Sean Paul 2016-10-28 7:27 ` [PATCH v6 5/9] drm/hisilicon/hibmc: Add crtc " Rongrong Zou 2016-10-28 7:27 ` Rongrong Zou 2016-11-10 22:14 ` Sean Paul 2016-11-10 22:14 ` Sean Paul 2016-11-12 10:19 ` Rongrong Zou 2016-11-12 10:19 ` Rongrong Zou 2016-11-14 17:10 ` Sean Paul 2016-11-14 17:10 ` Sean Paul 2016-10-28 7:27 ` [PATCH v6 6/9] drm/hisilicon/hibmc: Add encoder for VDAC Rongrong Zou 2016-10-28 7:27 ` Rongrong Zou 2016-11-10 22:20 ` Sean Paul 2016-11-10 22:20 ` Sean Paul 2016-11-12 10:36 ` Rongrong Zou 2016-11-12 10:36 ` Rongrong Zou 2016-10-28 7:28 ` [PATCH v6 7/9] drm/hisilicon/hibmc: Add connector " Rongrong Zou 2016-10-28 7:28 ` Rongrong Zou 2016-11-11 1:45 ` Sean Paul 2016-11-11 1:45 ` Sean Paul 2016-11-14 14:07 ` Rongrong Zou 2016-11-14 14:07 ` Rongrong Zou 2016-10-28 7:28 ` Rongrong Zou [this message] 2016-10-28 7:28 ` [PATCH v6 8/9] drm/hisilicon/hibmc: Add vblank interruput Rongrong Zou 2016-11-11 1:49 ` Sean Paul 2016-11-11 1:49 ` Sean Paul 2016-11-14 14:10 ` Rongrong Zou 2016-11-14 14:10 ` Rongrong Zou 2016-10-28 7:28 ` [PATCH v6 9/9] MAINTAINERS: Update HISILICON DRM entries Rongrong Zou 2016-10-28 7:28 ` Rongrong Zou 2016-11-11 1:50 ` Sean Paul 2016-11-11 1:50 ` Sean Paul
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1477639682-22520-9-git-send-email-zourongrong@gmail.com \ --to=zourongrong@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.