* [PATCH 1/2] drm/fsl-dcu: implement irq_preinstall/uninstall callbacks
@ 2017-06-02 3:00 Stefan Agner
2017-06-02 3:00 ` [PATCH 2/2] drm/fsl-dcu: use new drm_atomic_helper_shutdown Stefan Agner
2017-06-08 21:57 ` [PATCH 1/2] drm/fsl-dcu: implement irq_preinstall/uninstall callbacks Stefan Agner
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Agner @ 2017-06-02 3:00 UTC (permalink / raw)
To: dri-devel
Cc: daniel.vetter, airlied, meng.yi, alison.wang, linux-kernel, Stefan Agner
Make use of the irq_preinstall/uninstall callback to clear and
mask all interrupts. Use write 1 to clear as documented by the
data sheet (writing a 0 seems to have cleared interrupt status
too). Remove fsl_dcu_drm_irq_init and call drm_irq_install
directly from fsl_dcu_load makes error handling a bit simpler.
Do not set irq_enabled since drm_irq_install is taking care of
it.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index 6e00f4b..d86f35c 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -51,19 +51,12 @@ static const struct regmap_config fsl_dcu_regmap_config = {
.volatile_reg = fsl_dcu_drm_is_volatile_reg,
};
-static int fsl_dcu_drm_irq_init(struct drm_device *dev)
+static void fsl_dcu_irq_uninstall(struct drm_device *dev)
{
struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
- int ret;
-
- ret = drm_irq_install(dev, fsl_dev->irq);
- if (ret < 0)
- dev_err(dev->dev, "failed to install IRQ handler\n");
- regmap_write(fsl_dev->regmap, DCU_INT_STATUS, 0);
+ regmap_write(fsl_dev->regmap, DCU_INT_STATUS, ~0);
regmap_write(fsl_dev->regmap, DCU_INT_MASK, ~0);
-
- return ret;
}
static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)
@@ -83,10 +76,11 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)
goto done;
}
- ret = fsl_dcu_drm_irq_init(dev);
- if (ret < 0)
+ ret = drm_irq_install(dev, fsl_dev->irq);
+ if (ret < 0) {
+ dev_err(dev->dev, "failed to install IRQ handler\n");
goto done;
- dev->irq_enabled = true;
+ }
if (legacyfb_depth != 16 && legacyfb_depth != 24 &&
legacyfb_depth != 32) {
@@ -170,6 +164,8 @@ static struct drm_driver fsl_dcu_drm_driver = {
.load = fsl_dcu_load,
.unload = fsl_dcu_unload,
.irq_handler = fsl_dcu_drm_irq,
+ .irq_preinstall = fsl_dcu_irq_uninstall,
+ .irq_uninstall = fsl_dcu_irq_uninstall,
.gem_free_object_unlocked = drm_gem_cma_free_object,
.gem_vm_ops = &drm_gem_cma_vm_ops,
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
base-commit: 2a1720376adda5ecf8e636fbfb05339c7dad1c55
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] drm/fsl-dcu: use new drm_atomic_helper_shutdown
2017-06-02 3:00 [PATCH 1/2] drm/fsl-dcu: implement irq_preinstall/uninstall callbacks Stefan Agner
@ 2017-06-02 3:00 ` Stefan Agner
2017-06-08 21:57 ` [PATCH 1/2] drm/fsl-dcu: implement irq_preinstall/uninstall callbacks Stefan Agner
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Agner @ 2017-06-02 3:00 UTC (permalink / raw)
To: dri-devel
Cc: daniel.vetter, airlied, meng.yi, alison.wang, linux-kernel, Stefan Agner
Commit 18dddadc78c9 ("drm/atomic: Introduce drm_atomic_helper_shutdown")
introduced a new helper to shutdown all CRTCs to replace the buggy
drm_crtc_force_disable_all() function. Make use of the new atomic
helper drm_atomic_helper_shutdown() to shutdown CRTCs.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index d86f35c..71119e4 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -114,7 +114,7 @@ static void fsl_dcu_unload(struct drm_device *dev)
{
struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
- drm_crtc_force_disable_all(dev);
+ drm_atomic_helper_shutdown(dev);
drm_kms_helper_poll_fini(dev);
if (fsl_dev->fbdev)
--
git-series 0.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] drm/fsl-dcu: implement irq_preinstall/uninstall callbacks
2017-06-02 3:00 [PATCH 1/2] drm/fsl-dcu: implement irq_preinstall/uninstall callbacks Stefan Agner
2017-06-02 3:00 ` [PATCH 2/2] drm/fsl-dcu: use new drm_atomic_helper_shutdown Stefan Agner
@ 2017-06-08 21:57 ` Stefan Agner
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Agner @ 2017-06-08 21:57 UTC (permalink / raw)
To: dri-devel; +Cc: daniel.vetter, airlied, meng.yi, alison.wang, linux-kernel
On 2017-06-01 20:00, Stefan Agner wrote:
> Make use of the irq_preinstall/uninstall callback to clear and
> mask all interrupts. Use write 1 to clear as documented by the
> data sheet (writing a 0 seems to have cleared interrupt status
> too). Remove fsl_dcu_drm_irq_init and call drm_irq_install
> directly from fsl_dcu_load makes error handling a bit simpler.
> Do not set irq_enabled since drm_irq_install is taking care of
> it.
>
> Signed-off-by: Stefan Agner <stefan@agner.ch>
Applied to my fsl-dcu branch for 4.13.
--
Stefan
> ---
> drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
> b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
> index 6e00f4b..d86f35c 100644
> --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
> +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
> @@ -51,19 +51,12 @@ static const struct regmap_config fsl_dcu_regmap_config = {
> .volatile_reg = fsl_dcu_drm_is_volatile_reg,
> };
>
> -static int fsl_dcu_drm_irq_init(struct drm_device *dev)
> +static void fsl_dcu_irq_uninstall(struct drm_device *dev)
> {
> struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
> - int ret;
> -
> - ret = drm_irq_install(dev, fsl_dev->irq);
> - if (ret < 0)
> - dev_err(dev->dev, "failed to install IRQ handler\n");
>
> - regmap_write(fsl_dev->regmap, DCU_INT_STATUS, 0);
> + regmap_write(fsl_dev->regmap, DCU_INT_STATUS, ~0);
> regmap_write(fsl_dev->regmap, DCU_INT_MASK, ~0);
> -
> - return ret;
> }
>
> static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)
> @@ -83,10 +76,11 @@ static int fsl_dcu_load(struct drm_device *dev,
> unsigned long flags)
> goto done;
> }
>
> - ret = fsl_dcu_drm_irq_init(dev);
> - if (ret < 0)
> + ret = drm_irq_install(dev, fsl_dev->irq);
> + if (ret < 0) {
> + dev_err(dev->dev, "failed to install IRQ handler\n");
> goto done;
> - dev->irq_enabled = true;
> + }
>
> if (legacyfb_depth != 16 && legacyfb_depth != 24 &&
> legacyfb_depth != 32) {
> @@ -170,6 +164,8 @@ static struct drm_driver fsl_dcu_drm_driver = {
> .load = fsl_dcu_load,
> .unload = fsl_dcu_unload,
> .irq_handler = fsl_dcu_drm_irq,
> + .irq_preinstall = fsl_dcu_irq_uninstall,
> + .irq_uninstall = fsl_dcu_irq_uninstall,
> .gem_free_object_unlocked = drm_gem_cma_free_object,
> .gem_vm_ops = &drm_gem_cma_vm_ops,
> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
>
> base-commit: 2a1720376adda5ecf8e636fbfb05339c7dad1c55
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-08 21:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-02 3:00 [PATCH 1/2] drm/fsl-dcu: implement irq_preinstall/uninstall callbacks Stefan Agner
2017-06-02 3:00 ` [PATCH 2/2] drm/fsl-dcu: use new drm_atomic_helper_shutdown Stefan Agner
2017-06-08 21:57 ` [PATCH 1/2] drm/fsl-dcu: implement irq_preinstall/uninstall callbacks Stefan Agner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).