2021-12-06 13:48:04

by Yannick FERTRE

[permalink] [raw]
Subject: [PATCH] drm/stm: remove conflicting framebuffers

In case of using simplefb or another conflicting framebuffer,
call drm_aperture_remove_framebuffers() to remove memory allocated.

Signed-off-by: Yannick Fertre <[email protected]>
---
drivers/gpu/drm/stm/drv.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c
index 222869b232ae..9f441aadf2d5 100644
--- a/drivers/gpu/drm/stm/drv.c
+++ b/drivers/gpu/drm/stm/drv.c
@@ -14,6 +14,7 @@
#include <linux/of_platform.h>
#include <linux/pm_runtime.h>

+#include <drm/drm_aperture.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_drv.h>
@@ -183,6 +184,10 @@ static int stm_drm_platform_probe(struct platform_device *pdev)

DRM_DEBUG("%s\n", __func__);

+ ret = drm_aperture_remove_framebuffers(false, &drv_driver);
+ if (ret)
+ return ret;
+
dma_set_coherent_mask(dev, DMA_BIT_MASK(32));

ddev = drm_dev_alloc(&drv_driver, dev);
--
2.17.1



2021-12-06 14:23:46

by Thomas Zimmermann

[permalink] [raw]
Subject: Re: [PATCH] drm/stm: remove conflicting framebuffers

Hi

Am 06.12.21 um 14:47 schrieb Yannick Fertre:
> In case of using simplefb or another conflicting framebuffer,
> call drm_aperture_remove_framebuffers() to remove memory allocated.
>
> Signed-off-by: Yannick Fertre <[email protected]>

The patch should have contained a note that this is version 2 of the
change with a short changelog. Anyway

Reviewed-by: Thomas Zimmermann <[email protected]>

Best regards
Thomas

> ---
> drivers/gpu/drm/stm/drv.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c
> index 222869b232ae..9f441aadf2d5 100644
> --- a/drivers/gpu/drm/stm/drv.c
> +++ b/drivers/gpu/drm/stm/drv.c
> @@ -14,6 +14,7 @@
> #include <linux/of_platform.h>
> #include <linux/pm_runtime.h>
>
> +#include <drm/drm_aperture.h>
> #include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_drv.h>
> @@ -183,6 +184,10 @@ static int stm_drm_platform_probe(struct platform_device *pdev)
>
> DRM_DEBUG("%s\n", __func__);
>
> + ret = drm_aperture_remove_framebuffers(false, &drv_driver);
> + if (ret)
> + return ret;
> +
> dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
>
> ddev = drm_dev_alloc(&drv_driver, dev);
>

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev


Attachments:
OpenPGP_signature (840.00 B)
OpenPGP digital signature

2021-12-14 10:15:46

by Philippe CORNU

[permalink] [raw]
Subject: Re: [PATCH] drm/stm: remove conflicting framebuffers



On 12/6/21 3:23 PM, Thomas Zimmermann wrote:
> Hi
>
> Am 06.12.21 um 14:47 schrieb Yannick Fertre:
>> In case of using simplefb or another conflicting framebuffer,
>> call drm_aperture_remove_framebuffers() to remove memory allocated.
>>
>> Signed-off-by: Yannick Fertre <[email protected]>
>
> The patch should have contained a note that this is version 2 of the
> change with a short changelog. Anyway
>
> Reviewed-by: Thomas Zimmermann <[email protected]>
>
> Best regards
> Thomas
>
>> ---
>>   drivers/gpu/drm/stm/drv.c | 5 +++++
>>   1 file changed, 5 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c
>> index 222869b232ae..9f441aadf2d5 100644
>> --- a/drivers/gpu/drm/stm/drv.c
>> +++ b/drivers/gpu/drm/stm/drv.c
>> @@ -14,6 +14,7 @@
>>   #include <linux/of_platform.h>
>>   #include <linux/pm_runtime.h>
>> +#include <drm/drm_aperture.h>
>>   #include <drm/drm_atomic.h>
>>   #include <drm/drm_atomic_helper.h>
>>   #include <drm/drm_drv.h>
>> @@ -183,6 +184,10 @@ static int stm_drm_platform_probe(struct
>> platform_device *pdev)
>>       DRM_DEBUG("%s\n", __func__);
>> +    ret = drm_aperture_remove_framebuffers(false, &drv_driver);
>> +    if (ret)
>> +        return ret;
>> +

Hi Yannick,
and many thanks for your patch.
Acked-by: Philippe Cornu <[email protected]>
Philippe :-)


>>       dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
>>       ddev = drm_dev_alloc(&drv_driver, dev);
>>
>

2022-01-04 13:53:12

by Philippe CORNU

[permalink] [raw]
Subject: Re: [PATCH] drm/stm: remove conflicting framebuffers



On 12/14/21 11:15 AM, Philippe CORNU wrote:
>
>
> On 12/6/21 3:23 PM, Thomas Zimmermann wrote:
>> Hi
>>
>> Am 06.12.21 um 14:47 schrieb Yannick Fertre:
>>> In case of using simplefb or another conflicting framebuffer,
>>> call drm_aperture_remove_framebuffers() to remove memory allocated.
>>>
>>> Signed-off-by: Yannick Fertre <[email protected]>
>>
>> The patch should have contained a note that this is version 2 of the
>> change with a short changelog. Anyway
>>
>> Reviewed-by: Thomas Zimmermann <[email protected]>
>>
>> Best regards
>> Thomas
>>
>>> ---
>>>   drivers/gpu/drm/stm/drv.c | 5 +++++
>>>   1 file changed, 5 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c
>>> index 222869b232ae..9f441aadf2d5 100644
>>> --- a/drivers/gpu/drm/stm/drv.c
>>> +++ b/drivers/gpu/drm/stm/drv.c
>>> @@ -14,6 +14,7 @@
>>>   #include <linux/of_platform.h>
>>>   #include <linux/pm_runtime.h>
>>> +#include <drm/drm_aperture.h>
>>>   #include <drm/drm_atomic.h>
>>>   #include <drm/drm_atomic_helper.h>
>>>   #include <drm/drm_drv.h>
>>> @@ -183,6 +184,10 @@ static int stm_drm_platform_probe(struct
>>> platform_device *pdev)
>>>       DRM_DEBUG("%s\n", __func__);
>>> +    ret = drm_aperture_remove_framebuffers(false, &drv_driver);
>>> +    if (ret)
>>> +        return ret;
>>> +
>
> Hi Yannick,
> and many thanks for your patch.
> Acked-by: Philippe Cornu <[email protected]>
> Philippe :-)
>
>
>>>       dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
>>>       ddev = drm_dev_alloc(&drv_driver, dev);
>>>
>>

Applied on drm-misc-next.
Many thanks for your patch,
Philippe :-)