* [PATCH] pxa168fb: Add .remove function
@ 2010-08-29 11:17 Marek Vasut
2010-08-30 13:16 ` Haojian Zhuang
0 siblings, 1 reply; 5+ messages in thread
From: Marek Vasut @ 2010-08-29 11:17 UTC (permalink / raw)
To: linux-arm-kernel
The pxa168fb driver is missing .remove function so the framebuffer isn't
correctly shut down when the module is removed.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
I only compile-tested it. Haojian, could you please review and test it properly?
Thanks !
drivers/video/pxa168fb.c | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index 5d786bd..7ce4aac 100644
--- a/drivers/video/pxa168fb.c
+++ b/drivers/video/pxa168fb.c
@@ -784,12 +784,51 @@ failed:
return ret;
}
+static int __devexit pxa168fb_remove(struct platform_device *pdev)
+{
+ struct pxa168fb_info *fbi = platform_get_drvdata(pdev);
+ struct fb_info *info;
+ int irq;
+ struct resource *res;
+
+ if (!fbi)
+ return 0;
+
+ info = fbi->info;
+
+ unregister_framebuffer(info);
+
+ writel(GRA_FRAME_IRQ0_ENA(0x0), fbi->reg_base + SPU_IRQ_ENA);
+
+ if (info->cmap.len)
+ fb_dealloc_cmap(&info->cmap);
+
+ irq = platform_get_irq(pdev, 0);
+ free_irq(irq, fbi);
+
+ dma_free_writecombine(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
+ info->screen_base, info->fix.smem_start);
+
+ iounmap(fbi->reg_base);
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ release_mem_region(res->start, resource_size(res));
+
+ clk_disable(fbi->clk);
+ clk_put(fbi->clk);
+
+ framebuffer_release(info);
+
+ return 0;
+}
+
static struct platform_driver pxa168fb_driver = {
.driver = {
.name = "pxa168-fb",
.owner = THIS_MODULE,
},
.probe = pxa168fb_probe,
+ .remove = __devexit_p(pxa168fb_remove),
};
static int __init pxa168fb_init(void)
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] pxa168fb: Add .remove function
@ 2010-08-30 0:32 Haojian Zhuang
2010-08-30 17:43 ` Marek Vasut
0 siblings, 1 reply; 5+ messages in thread
From: Haojian Zhuang @ 2010-08-30 0:32 UTC (permalink / raw)
To: linux-arm-kernel
The pxa168fb driver is missing .remove function so the framebuffer isn't
correctly shut down when the module is removed.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
---
drivers/video/pxa168fb.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index c91a7f7..ec2ddb2 100644
--- a/drivers/video/pxa168fb.c
+++ b/drivers/video/pxa168fb.c
@@ -784,12 +784,53 @@ failed:
return ret;
}
+static int __devexit pxa168fb_remove(struct platform_device *pdev)
+{
+ struct pxa168fb_info *fbi = platform_get_drvdata(pdev);
+ struct fb_info *info;
+ int irq;
+ unsigned int data;
+
+ if (!fbi)
+ return 0;
+
+ /* disable DMA transfer */
+ data = readl(fbi->reg_base + LCD_SPU_DMA_CTRL0);
+ data &= ~CFG_GRA_ENA_MASK;
+ writel(data, fbi->reg_base + LCD_SPU_DMA_CTRL0);
+
+ info = fbi->info;
+
+ unregister_framebuffer(info);
+
+ writel(GRA_FRAME_IRQ0_ENA(0x0), fbi->reg_base + SPU_IRQ_ENA);
+
+ if (info->cmap.len)
+ fb_dealloc_cmap(&info->cmap);
+
+ irq = platform_get_irq(pdev, 0);
+ free_irq(irq, fbi);
+
+ dma_free_writecombine(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
+ info->screen_base, info->fix.smem_start);
+
+ iounmap(fbi->reg_base);
+
+ clk_disable(fbi->clk);
+ clk_put(fbi->clk);
+
+ framebuffer_release(info);
+
+ return 0;
+}
+
static struct platform_driver pxa168fb_driver = {
.driver = {
.name = "pxa168-fb",
.owner = THIS_MODULE,
},
.probe = pxa168fb_probe,
+ .remove = __devexit_p(pxa168fb_remove),
};
static int __devinit pxa168fb_init(void)
@@ -798,6 +839,12 @@ static int __devinit pxa168fb_init(void)
}
module_init(pxa168fb_init);
+static void __exit pxa168fb_exit(void)
+{
+ platform_driver_unregister(&pxa168fb_driver);
+}
+module_exit(pxa168fb_exit);
+
MODULE_AUTHOR("Lennert Buytenhek <buytenh@marvell.com> "
"Green Wan <gwan@marvell.com>");
MODULE_DESCRIPTION("Framebuffer driver for PXA168/910");
--
1.5.6.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] pxa168fb: Add .remove function
2010-08-29 11:17 [PATCH] pxa168fb: Add .remove function Marek Vasut
@ 2010-08-30 13:16 ` Haojian Zhuang
0 siblings, 0 replies; 5+ messages in thread
From: Haojian Zhuang @ 2010-08-30 13:16 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Aug 29, 2010 at 7:17 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
> The pxa168fb driver is missing .remove function so the framebuffer isn't
> correctly shut down when the module is removed.
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
>
> I only compile-tested it. Haojian, could you please review and test it properly?
> Thanks !
>
> ?drivers/video/pxa168fb.c | ? 39 +++++++++++++++++++++++++++++++++++++++
> ?1 files changed, 39 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
> index 5d786bd..7ce4aac 100644
> --- a/drivers/video/pxa168fb.c
> +++ b/drivers/video/pxa168fb.c
> @@ -784,12 +784,51 @@ failed:
> ? ? ? ?return ret;
> ?}
>
> +static int __devexit pxa168fb_remove(struct platform_device *pdev)
> +{
> + ? ? ? struct pxa168fb_info *fbi = platform_get_drvdata(pdev);
> + ? ? ? struct fb_info *info;
> + ? ? ? int irq;
> + ? ? ? struct resource *res;
> +
> + ? ? ? if (!fbi)
> + ? ? ? ? ? ? ? return 0;
> +
> + ? ? ? info = fbi->info;
> +
> + ? ? ? unregister_framebuffer(info);
> +
> + ? ? ? writel(GRA_FRAME_IRQ0_ENA(0x0), fbi->reg_base + SPU_IRQ_ENA);
> +
> + ? ? ? if (info->cmap.len)
> + ? ? ? ? ? ? ? fb_dealloc_cmap(&info->cmap);
> +
> + ? ? ? irq = platform_get_irq(pdev, 0);
> + ? ? ? free_irq(irq, fbi);
> +
> + ? ? ? dma_free_writecombine(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? info->screen_base, info->fix.smem_start);
> +
> + ? ? ? iounmap(fbi->reg_base);
> +
> + ? ? ? res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + ? ? ? release_mem_region(res->start, resource_size(res));
> +
> + ? ? ? clk_disable(fbi->clk);
> + ? ? ? clk_put(fbi->clk);
> +
> + ? ? ? framebuffer_release(info);
> +
> + ? ? ? return 0;
> +}
> +
> ?static struct platform_driver pxa168fb_driver = {
> ? ? ? ?.driver ? ? ? ? = {
> ? ? ? ? ? ? ? ?.name ? = "pxa168-fb",
> ? ? ? ? ? ? ? ?.owner ?= THIS_MODULE,
> ? ? ? ?},
> ? ? ? ?.probe ? ? ? ? ?= pxa168fb_probe,
> + ? ? ? .remove ? ? ? ? = __devexit_p(pxa168fb_remove),
> ?};
>
> ?static int __init pxa168fb_init(void)
> --
> 1.7.1
>
>
You should also add module_exit(). DMA isn't stopping while remove()
is executed. And you needn't release resource. I update the patch
based on yours.
Thanks
Haojian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-pxa168fb-Add-.remove-function.patch
Type: text/x-patch
Size: 2262 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100830/97188b8b/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-pxa168fb-fix-clear-operation.patch
Type: text/x-patch
Size: 996 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100830/97188b8b/attachment-0003.bin>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] pxa168fb: Add .remove function
2010-08-30 0:32 Haojian Zhuang
@ 2010-08-30 17:43 ` Marek Vasut
2010-09-05 11:08 ` Eric Miao
0 siblings, 1 reply; 5+ messages in thread
From: Marek Vasut @ 2010-08-30 17:43 UTC (permalink / raw)
To: linux-arm-kernel
Dne Po 30. srpna 2010 02:32:16 Haojian Zhuang napsal(a):
> The pxa168fb driver is missing .remove function so the framebuffer isn't
> correctly shut down when the module is removed.
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
> ---
> drivers/video/pxa168fb.c | 47
> ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47
> insertions(+), 0 deletions(-)
>
> diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
> index c91a7f7..ec2ddb2 100644
> --- a/drivers/video/pxa168fb.c
> +++ b/drivers/video/pxa168fb.c
> @@ -784,12 +784,53 @@ failed:
> return ret;
> }
>
> +static int __devexit pxa168fb_remove(struct platform_device *pdev)
> +{
> + struct pxa168fb_info *fbi = platform_get_drvdata(pdev);
> + struct fb_info *info;
> + int irq;
> + unsigned int data;
> +
> + if (!fbi)
> + return 0;
> +
> + /* disable DMA transfer */
> + data = readl(fbi->reg_base + LCD_SPU_DMA_CTRL0);
> + data &= ~CFG_GRA_ENA_MASK;
> + writel(data, fbi->reg_base + LCD_SPU_DMA_CTRL0);
> +
> + info = fbi->info;
> +
> + unregister_framebuffer(info);
> +
Haojian, is this line below correct?
If so, for this modified version, find my:
Acked-by: Marek Vasut <marek.vasut@gmail.com>
> + writel(GRA_FRAME_IRQ0_ENA(0x0), fbi->reg_base + SPU_IRQ_ENA);
> +
> + if (info->cmap.len)
> + fb_dealloc_cmap(&info->cmap);
> +
> + irq = platform_get_irq(pdev, 0);
> + free_irq(irq, fbi);
> +
> + dma_free_writecombine(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
> + info->screen_base, info->fix.smem_start);
> +
> + iounmap(fbi->reg_base);
> +
> + clk_disable(fbi->clk);
> + clk_put(fbi->clk);
> +
> + framebuffer_release(info);
> +
> + return 0;
> +}
> +
> static struct platform_driver pxa168fb_driver = {
> .driver = {
> .name = "pxa168-fb",
> .owner = THIS_MODULE,
> },
> .probe = pxa168fb_probe,
> + .remove = __devexit_p(pxa168fb_remove),
> };
>
> static int __devinit pxa168fb_init(void)
> @@ -798,6 +839,12 @@ static int __devinit pxa168fb_init(void)
> }
> module_init(pxa168fb_init);
>
> +static void __exit pxa168fb_exit(void)
> +{
> + platform_driver_unregister(&pxa168fb_driver);
> +}
> +module_exit(pxa168fb_exit);
> +
> MODULE_AUTHOR("Lennert Buytenhek <buytenh@marvell.com> "
> "Green Wan <gwan@marvell.com>");
> MODULE_DESCRIPTION("Framebuffer driver for PXA168/910");
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] pxa168fb: Add .remove function
2010-08-30 17:43 ` Marek Vasut
@ 2010-09-05 11:08 ` Eric Miao
0 siblings, 0 replies; 5+ messages in thread
From: Eric Miao @ 2010-09-05 11:08 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 31, 2010 at 1:43 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> Dne Po 30. srpna 2010 02:32:16 Haojian Zhuang napsal(a):
>> The pxa168fb driver is missing .remove function so the framebuffer isn't
>> correctly shut down when the module is removed.
>>
>> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
>> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
>> ---
>> ?drivers/video/pxa168fb.c | ? 47
>> ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47
>> insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
>> index c91a7f7..ec2ddb2 100644
>> --- a/drivers/video/pxa168fb.c
>> +++ b/drivers/video/pxa168fb.c
>> @@ -784,12 +784,53 @@ failed:
>> ? ? ? return ret;
>> ?}
>>
>> +static int __devexit pxa168fb_remove(struct platform_device *pdev)
>> +{
>> + ? ? struct pxa168fb_info *fbi = platform_get_drvdata(pdev);
>> + ? ? struct fb_info *info;
>> + ? ? int irq;
>> + ? ? unsigned int data;
>> +
>> + ? ? if (!fbi)
>> + ? ? ? ? ? ? return 0;
>> +
>> + ? ? /* disable DMA transfer */
>> + ? ? data = readl(fbi->reg_base + LCD_SPU_DMA_CTRL0);
>> + ? ? data &= ~CFG_GRA_ENA_MASK;
>> + ? ? writel(data, fbi->reg_base + LCD_SPU_DMA_CTRL0);
>> +
>> + ? ? info = fbi->info;
>> +
>> + ? ? unregister_framebuffer(info);
>> +
>
> Haojian, is this line below correct?
>
> If so, for this modified version, find my:
>
> Acked-by: Marek Vasut <marek.vasut@gmail.com>
>
Applied to 'devel'.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-09-05 11:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-29 11:17 [PATCH] pxa168fb: Add .remove function Marek Vasut
2010-08-30 13:16 ` Haojian Zhuang
-- strict thread matches above, loose matches on Subject: below --
2010-08-30 0:32 Haojian Zhuang
2010-08-30 17:43 ` Marek Vasut
2010-09-05 11:08 ` Eric Miao
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).