From: Sam Ravnborg <sam@ravnborg.org> To: dri-devel@lists.freedesktop.org Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>, Boris Brezillon <bbrezillon@kernel.org>, Claudiu Beznea <claudiu.beznea@microchip.com>, Ludovic Desroches <ludovic.desroches@microchip.com>, Thomas Zimmermann <tzimmermann@suse.de>, Sam Ravnborg <sam@ravnborg.org>, Peter Rosin <peda@axentia.se>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 2/2] drm/atmel-hlcdc: Convert to Linux IRQ interfaces Date: Sun, 11 Jul 2021 11:19:26 +0200 [thread overview] Message-ID: <20210711091926.552861-3-sam@ravnborg.org> (raw) In-Reply-To: <20210711091926.552861-1-sam@ravnborg.org> The drm mid-layer for irq's is not relevant for atomic display drivers, and will be available only for legacy drivers in the future. Drop usage in the atmel hlcdc driver. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Boris Brezillon <bbrezillon@kernel.org> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Ludovic Desroches <ludovic.desroches@microchip.com> Cc: linux-arm-kernel@lists.infradead.org --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index f67363188cbc..6b3f353e1cc7 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -22,7 +22,6 @@ #include <drm/drm_fb_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_irq.h> #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h> @@ -521,9 +520,8 @@ atmel_hlcdc_dc_mode_valid(struct atmel_hlcdc_dc *dc, return MODE_OK; } -static int atmel_hlcdc_dc_irq_postinstall(struct drm_device *dev) +static int atmel_hlcdc_dc_irq_postinstall(struct atmel_hlcdc_dc *dc) { - struct atmel_hlcdc_dc *dc = dev->dev_private; unsigned int cfg = 0; int i; @@ -538,9 +536,8 @@ static int atmel_hlcdc_dc_irq_postinstall(struct drm_device *dev) return 0; } -static void atmel_hlcdc_dc_irq_uninstall(struct drm_device *dev) +static void atmel_hlcdc_dc_irq_reset(struct atmel_hlcdc_dc *dc) { - struct atmel_hlcdc_dc *dc = dev->dev_private; unsigned int isr; regmap_write(dc->hlcdc->regmap, ATMEL_HLCDC_IDR, 0xffffffff); @@ -672,12 +669,14 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev) drm_mode_config_reset(dev); pm_runtime_get_sync(dev->dev); - ret = drm_irq_install(dev, dc->hlcdc->irq); + atmel_hlcdc_dc_irq_reset(dc); + ret = request_irq(dc->hlcdc->irq, atmel_hlcdc_dc_irq_handler, 0, dev->driver->name, dev); pm_runtime_put_sync(dev->dev); if (ret < 0) { dev_err(dev->dev, "failed to install IRQ handler\n"); goto err_periph_clk_disable; } + atmel_hlcdc_dc_irq_postinstall(dc); platform_set_drvdata(pdev, dev); @@ -701,7 +700,9 @@ static void atmel_hlcdc_dc_unload(struct drm_device *dev) drm_mode_config_cleanup(dev); pm_runtime_get_sync(dev->dev); - drm_irq_uninstall(dev); + + atmel_hlcdc_dc_irq_reset(dc); + free_irq(dc->hlcdc->irq, dev); pm_runtime_put_sync(dev->dev); dev->dev_private = NULL; @@ -714,10 +715,6 @@ DEFINE_DRM_GEM_CMA_FOPS(fops); static const struct drm_driver atmel_hlcdc_dc_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, - .irq_handler = atmel_hlcdc_dc_irq_handler, - .irq_preinstall = atmel_hlcdc_dc_irq_uninstall, - .irq_postinstall = atmel_hlcdc_dc_irq_postinstall, - .irq_uninstall = atmel_hlcdc_dc_irq_uninstall, DRM_GEM_CMA_DRIVER_OPS, .fops = &fops, .name = "atmel-hlcdc", -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Sam Ravnborg <sam@ravnborg.org> To: dri-devel@lists.freedesktop.org Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>, Boris Brezillon <bbrezillon@kernel.org>, Nicolas Ferre <nicolas.ferre@microchip.com>, Claudiu Beznea <claudiu.beznea@microchip.com>, Ludovic Desroches <ludovic.desroches@microchip.com>, Thomas Zimmermann <tzimmermann@suse.de>, Sam Ravnborg <sam@ravnborg.org>, Peter Rosin <peda@axentia.se>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 2/2] drm/atmel-hlcdc: Convert to Linux IRQ interfaces Date: Sun, 11 Jul 2021 11:19:26 +0200 [thread overview] Message-ID: <20210711091926.552861-3-sam@ravnborg.org> (raw) In-Reply-To: <20210711091926.552861-1-sam@ravnborg.org> The drm mid-layer for irq's is not relevant for atomic display drivers, and will be available only for legacy drivers in the future. Drop usage in the atmel hlcdc driver. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Boris Brezillon <bbrezillon@kernel.org> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Ludovic Desroches <ludovic.desroches@microchip.com> Cc: linux-arm-kernel@lists.infradead.org --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index f67363188cbc..6b3f353e1cc7 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -22,7 +22,6 @@ #include <drm/drm_fb_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_irq.h> #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h> @@ -521,9 +520,8 @@ atmel_hlcdc_dc_mode_valid(struct atmel_hlcdc_dc *dc, return MODE_OK; } -static int atmel_hlcdc_dc_irq_postinstall(struct drm_device *dev) +static int atmel_hlcdc_dc_irq_postinstall(struct atmel_hlcdc_dc *dc) { - struct atmel_hlcdc_dc *dc = dev->dev_private; unsigned int cfg = 0; int i; @@ -538,9 +536,8 @@ static int atmel_hlcdc_dc_irq_postinstall(struct drm_device *dev) return 0; } -static void atmel_hlcdc_dc_irq_uninstall(struct drm_device *dev) +static void atmel_hlcdc_dc_irq_reset(struct atmel_hlcdc_dc *dc) { - struct atmel_hlcdc_dc *dc = dev->dev_private; unsigned int isr; regmap_write(dc->hlcdc->regmap, ATMEL_HLCDC_IDR, 0xffffffff); @@ -672,12 +669,14 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev) drm_mode_config_reset(dev); pm_runtime_get_sync(dev->dev); - ret = drm_irq_install(dev, dc->hlcdc->irq); + atmel_hlcdc_dc_irq_reset(dc); + ret = request_irq(dc->hlcdc->irq, atmel_hlcdc_dc_irq_handler, 0, dev->driver->name, dev); pm_runtime_put_sync(dev->dev); if (ret < 0) { dev_err(dev->dev, "failed to install IRQ handler\n"); goto err_periph_clk_disable; } + atmel_hlcdc_dc_irq_postinstall(dc); platform_set_drvdata(pdev, dev); @@ -701,7 +700,9 @@ static void atmel_hlcdc_dc_unload(struct drm_device *dev) drm_mode_config_cleanup(dev); pm_runtime_get_sync(dev->dev); - drm_irq_uninstall(dev); + + atmel_hlcdc_dc_irq_reset(dc); + free_irq(dc->hlcdc->irq, dev); pm_runtime_put_sync(dev->dev); dev->dev_private = NULL; @@ -714,10 +715,6 @@ DEFINE_DRM_GEM_CMA_FOPS(fops); static const struct drm_driver atmel_hlcdc_dc_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, - .irq_handler = atmel_hlcdc_dc_irq_handler, - .irq_preinstall = atmel_hlcdc_dc_irq_uninstall, - .irq_postinstall = atmel_hlcdc_dc_irq_postinstall, - .irq_uninstall = atmel_hlcdc_dc_irq_uninstall, DRM_GEM_CMA_DRIVER_OPS, .fops = &fops, .name = "atmel-hlcdc", -- 2.30.2
next prev parent reply other threads:[~2021-07-11 9:21 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-11 9:19 [PATCH v1 0/2] drm/atmel-hlcdc: drop use of drm_irq mid-layer Sam Ravnborg 2021-07-11 9:19 ` Sam Ravnborg 2021-07-11 9:19 ` [PATCH v1 1/2] drm/atmel-hlcdc: Move interrupt helper funtions Sam Ravnborg 2021-07-11 9:19 ` Sam Ravnborg 2021-07-11 9:19 ` Sam Ravnborg [this message] 2021-07-11 9:19 ` [PATCH v1 2/2] drm/atmel-hlcdc: Convert to Linux IRQ interfaces Sam Ravnborg 2021-07-15 21:55 ` [PATCH v1 0/2] drm/atmel-hlcdc: drop use of drm_irq mid-layer Dan.Sneddon 2021-07-15 21:55 ` Dan.Sneddon 2021-07-15 22:08 ` Sam Ravnborg 2021-07-15 22:08 ` Sam Ravnborg
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=20210711091926.552861-3-sam@ravnborg.org \ --to=sam@ravnborg.org \ --cc=alexandre.belloni@bootlin.com \ --cc=bbrezillon@kernel.org \ --cc=claudiu.beznea@microchip.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=ludovic.desroches@microchip.com \ --cc=peda@axentia.se \ --cc=tzimmermann@suse.de \ /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.