diff mbox series

[3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers

Message ID 20230729193157.15446-4-tzimmermann@suse.de (mailing list archive)
State Handled Elsewhere
Headers show
Series fbdev: Rename helpers for struct fb_ops | expand

Commit Message

Thomas Zimmermann July 29, 2023, 7:26 p.m. UTC
Change the infix for fbdev's DMA-memory helpers from _DMA_ to
_DMAMEM_. The helpers perform operations within DMA-able memory,
but they don't perform DMA operations. Naming should make this
clear. Adapt all users. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/Kconfig                   | 2 +-
 drivers/gpu/drm/drm_fbdev_dma.c           | 4 ++--
 drivers/gpu/drm/exynos/Kconfig            | 2 +-
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 ++--
 drivers/gpu/drm/omapdrm/Kconfig           | 2 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c      | 4 ++--
 drivers/gpu/drm/tegra/Kconfig             | 2 +-
 drivers/gpu/drm/tegra/fbdev.c             | 4 ++--
 drivers/video/fbdev/core/Kconfig          | 2 +-
 include/linux/fb.h                        | 4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)

Comments

Helge Deller July 30, 2023, 4:20 p.m. UTC | #1
On 7/29/23 21:26, Thomas Zimmermann wrote:
> Change the infix for fbdev's DMA-memory helpers from _DMA_ to
> _DMAMEM_. The helpers perform operations within DMA-able memory,

Since "DMA" stands for "Direct Memory Access", people already
know that it operates on memory. I don't think we need
to add "MEM" here.
So, maybe we should drop this patch and just keep "DMA"?

Other than that you patch series looks good!
Acked-by: Helge Deller <deller@gmx.de>

Helge


> but they don't perform DMA operations. Naming should make this
> clear. Adapt all users. No functional changes.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>   drivers/gpu/drm/Kconfig                   | 2 +-
>   drivers/gpu/drm/drm_fbdev_dma.c           | 4 ++--
>   drivers/gpu/drm/exynos/Kconfig            | 2 +-
>   drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 ++--
>   drivers/gpu/drm/omapdrm/Kconfig           | 2 +-
>   drivers/gpu/drm/omapdrm/omap_fbdev.c      | 4 ++--
>   drivers/gpu/drm/tegra/Kconfig             | 2 +-
>   drivers/gpu/drm/tegra/fbdev.c             | 4 ++--
>   drivers/video/fbdev/core/Kconfig          | 2 +-
>   include/linux/fb.h                        | 4 ++--
>   10 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> index 34da733e8606..b51c6a141dfa 100644
> --- a/drivers/gpu/drm/Kconfig
> +++ b/drivers/gpu/drm/Kconfig
> @@ -224,7 +224,7 @@ config DRM_TTM_HELPER
>   config DRM_GEM_DMA_HELPER
>   	tristate
>   	depends on DRM
> -	select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
> +	select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>   	help
>   	  Choose this if you need the GEM DMA helper functions
>
> diff --git a/drivers/gpu/drm/drm_fbdev_dma.c b/drivers/gpu/drm/drm_fbdev_dma.c
> index 6db168f94290..6c9427bb4053 100644
> --- a/drivers/gpu/drm/drm_fbdev_dma.c
> +++ b/drivers/gpu/drm/drm_fbdev_dma.c
> @@ -62,9 +62,9 @@ static const struct fb_ops drm_fbdev_dma_fb_ops = {
>   	.owner = THIS_MODULE,
>   	.fb_open = drm_fbdev_dma_fb_open,
>   	.fb_release = drm_fbdev_dma_fb_release,
> -	__FB_DEFAULT_DMA_OPS_RDWR,
> +	__FB_DEFAULT_DMAMEM_OPS_RDWR,
>   	DRM_FB_HELPER_DEFAULT_OPS,
> -	__FB_DEFAULT_DMA_OPS_DRAW,
> +	__FB_DEFAULT_DMAMEM_OPS_DRAW,
>   	.fb_mmap = drm_fbdev_dma_fb_mmap,
>   	.fb_destroy = drm_fbdev_dma_fb_destroy,
>   };
> diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
> index 661b42ad4873..733b109a5095 100644
> --- a/drivers/gpu/drm/exynos/Kconfig
> +++ b/drivers/gpu/drm/exynos/Kconfig
> @@ -7,7 +7,7 @@ config DRM_EXYNOS
>   	select DRM_DISPLAY_HELPER if DRM_EXYNOS_DP
>   	select DRM_KMS_HELPER
>   	select VIDEOMODE_HELPERS
> -	select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
> +	select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>   	select SND_SOC_HDMI_CODEC if SND_SOC
>   	help
>   	  Choose this option if you have a Samsung SoC Exynos chipset.
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> index 4ccb385aff52..a379c8ca435a 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> @@ -49,9 +49,9 @@ static void exynos_drm_fb_destroy(struct fb_info *info)
>
>   static const struct fb_ops exynos_drm_fb_ops = {
>   	.owner		= THIS_MODULE,
> -	__FB_DEFAULT_DMA_OPS_RDWR,
> +	__FB_DEFAULT_DMAMEM_OPS_RDWR,
>   	DRM_FB_HELPER_DEFAULT_OPS,
> -	__FB_DEFAULT_DMA_OPS_DRAW,
> +	__FB_DEFAULT_DMAMEM_OPS_DRAW,
>   	.fb_mmap        = exynos_drm_fb_mmap,
>   	.fb_destroy	= exynos_drm_fb_destroy,
>   };
> diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
> index d3c4877e465c..b715301ec79f 100644
> --- a/drivers/gpu/drm/omapdrm/Kconfig
> +++ b/drivers/gpu/drm/omapdrm/Kconfig
> @@ -4,7 +4,7 @@ config DRM_OMAP
>   	depends on DRM && OF
>   	depends on ARCH_OMAP2PLUS
>   	select DRM_KMS_HELPER
> -	select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
> +	select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>   	select VIDEOMODE_HELPERS
>   	select HDMI
>   	default n
> diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
> index 5b33c789e17a..6b08b137af1a 100644
> --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
> +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
> @@ -106,13 +106,13 @@ static void omap_fbdev_fb_destroy(struct fb_info *info)
>
>   static const struct fb_ops omap_fb_ops = {
>   	.owner = THIS_MODULE,
> -	__FB_DEFAULT_DMA_OPS_RDWR,
> +	__FB_DEFAULT_DMAMEM_OPS_RDWR,
>   	.fb_check_var	= drm_fb_helper_check_var,
>   	.fb_set_par	= drm_fb_helper_set_par,
>   	.fb_setcmap	= drm_fb_helper_setcmap,
>   	.fb_blank	= drm_fb_helper_blank,
>   	.fb_pan_display = omap_fbdev_pan_display,
> -	__FB_DEFAULT_DMA_OPS_DRAW,
> +	__FB_DEFAULT_DMAMEM_OPS_DRAW,
>   	.fb_ioctl	= drm_fb_helper_ioctl,
>   	.fb_mmap	= omap_fbdev_fb_mmap,
>   	.fb_destroy	= omap_fbdev_fb_destroy,
> diff --git a/drivers/gpu/drm/tegra/Kconfig b/drivers/gpu/drm/tegra/Kconfig
> index 39452c8480c1..84e7e6bc3a0c 100644
> --- a/drivers/gpu/drm/tegra/Kconfig
> +++ b/drivers/gpu/drm/tegra/Kconfig
> @@ -12,7 +12,7 @@ config DRM_TEGRA
>   	select DRM_KMS_HELPER
>   	select DRM_MIPI_DSI
>   	select DRM_PANEL
> -	select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
> +	select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>   	select TEGRA_HOST1X
>   	select INTERCONNECT
>   	select IOMMU_IOVA
> diff --git a/drivers/gpu/drm/tegra/fbdev.c b/drivers/gpu/drm/tegra/fbdev.c
> index 206a399c42d6..db6eaac3d30e 100644
> --- a/drivers/gpu/drm/tegra/fbdev.c
> +++ b/drivers/gpu/drm/tegra/fbdev.c
> @@ -59,9 +59,9 @@ static void tegra_fbdev_fb_destroy(struct fb_info *info)
>
>   static const struct fb_ops tegra_fb_ops = {
>   	.owner = THIS_MODULE,
> -	__FB_DEFAULT_DMA_OPS_RDWR,
> +	__FB_DEFAULT_DMAMEM_OPS_RDWR,
>   	DRM_FB_HELPER_DEFAULT_OPS,
> -	__FB_DEFAULT_DMA_OPS_DRAW,
> +	__FB_DEFAULT_DMAMEM_OPS_DRAW,
>   	.fb_mmap = tegra_fb_mmap,
>   	.fb_destroy = tegra_fbdev_fb_destroy,
>   };
> diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig
> index 28e771a46df6..baf7e852c75b 100644
> --- a/drivers/video/fbdev/core/Kconfig
> +++ b/drivers/video/fbdev/core/Kconfig
> @@ -136,7 +136,7 @@ config FB_DEFERRED_IO
>   	bool
>   	depends on FB_CORE
>
> -config FB_DMA_HELPERS
> +config FB_DMAMEM_HELPERS
>   	bool
>   	depends on FB_CORE
>   	select FB_SYS_COPYAREA
> diff --git a/include/linux/fb.h b/include/linux/fb.h
> index 76472482dc30..d255263c2d1d 100644
> --- a/include/linux/fb.h
> +++ b/include/linux/fb.h
> @@ -579,11 +579,11 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
>    * Helpers for framebuffers in DMA-able memory
>    */
>
> -#define __FB_DEFAULT_DMA_OPS_RDWR \
> +#define __FB_DEFAULT_DMAMEM_OPS_RDWR \
>   	.fb_read	= fb_sys_read, \
>   	.fb_write	= fb_sys_write
>
> -#define __FB_DEFAULT_DMA_OPS_DRAW \
> +#define __FB_DEFAULT_DMAMEM_OPS_DRAW \
>   	.fb_fillrect	= sys_fillrect, \
>   	.fb_copyarea	= sys_copyarea, \
>   	.fb_imageblit	= sys_imageblit
Thomas Zimmermann July 31, 2023, 7:30 a.m. UTC | #2
Hi

Am 30.07.23 um 18:20 schrieb Helge Deller:
> On 7/29/23 21:26, Thomas Zimmermann wrote:
>> Change the infix for fbdev's DMA-memory helpers from _DMA_ to
>> _DMAMEM_. The helpers perform operations within DMA-able memory,
> 
> Since "DMA" stands for "Direct Memory Access", people already
> know that it operates on memory. I don't think we need
> to add "MEM" here.
> So, maybe we should drop this patch and just keep "DMA"?

I think I'd rather leave it to DMAMEM. It's a bit redundant, but it's 
consistent with the other names and it's clear.  Otherwise, someone 
might thing these helpers are for using DMA engines of some kind.

Best regards
Thomas

> 
> Other than that you patch series looks good!
> Acked-by: Helge Deller <deller@gmx.de>
> 
> Helge
> 
> 
>> but they don't perform DMA operations. Naming should make this
>> clear. Adapt all users. No functional changes.
>>
>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
>> ---
>>   drivers/gpu/drm/Kconfig                   | 2 +-
>>   drivers/gpu/drm/drm_fbdev_dma.c           | 4 ++--
>>   drivers/gpu/drm/exynos/Kconfig            | 2 +-
>>   drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 ++--
>>   drivers/gpu/drm/omapdrm/Kconfig           | 2 +-
>>   drivers/gpu/drm/omapdrm/omap_fbdev.c      | 4 ++--
>>   drivers/gpu/drm/tegra/Kconfig             | 2 +-
>>   drivers/gpu/drm/tegra/fbdev.c             | 4 ++--
>>   drivers/video/fbdev/core/Kconfig          | 2 +-
>>   include/linux/fb.h                        | 4 ++--
>>   10 files changed, 15 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
>> index 34da733e8606..b51c6a141dfa 100644
>> --- a/drivers/gpu/drm/Kconfig
>> +++ b/drivers/gpu/drm/Kconfig
>> @@ -224,7 +224,7 @@ config DRM_TTM_HELPER
>>   config DRM_GEM_DMA_HELPER
>>       tristate
>>       depends on DRM
>> -    select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
>> +    select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>>       help
>>         Choose this if you need the GEM DMA helper functions
>>
>> diff --git a/drivers/gpu/drm/drm_fbdev_dma.c 
>> b/drivers/gpu/drm/drm_fbdev_dma.c
>> index 6db168f94290..6c9427bb4053 100644
>> --- a/drivers/gpu/drm/drm_fbdev_dma.c
>> +++ b/drivers/gpu/drm/drm_fbdev_dma.c
>> @@ -62,9 +62,9 @@ static const struct fb_ops drm_fbdev_dma_fb_ops = {
>>       .owner = THIS_MODULE,
>>       .fb_open = drm_fbdev_dma_fb_open,
>>       .fb_release = drm_fbdev_dma_fb_release,
>> -    __FB_DEFAULT_DMA_OPS_RDWR,
>> +    __FB_DEFAULT_DMAMEM_OPS_RDWR,
>>       DRM_FB_HELPER_DEFAULT_OPS,
>> -    __FB_DEFAULT_DMA_OPS_DRAW,
>> +    __FB_DEFAULT_DMAMEM_OPS_DRAW,
>>       .fb_mmap = drm_fbdev_dma_fb_mmap,
>>       .fb_destroy = drm_fbdev_dma_fb_destroy,
>>   };
>> diff --git a/drivers/gpu/drm/exynos/Kconfig 
>> b/drivers/gpu/drm/exynos/Kconfig
>> index 661b42ad4873..733b109a5095 100644
>> --- a/drivers/gpu/drm/exynos/Kconfig
>> +++ b/drivers/gpu/drm/exynos/Kconfig
>> @@ -7,7 +7,7 @@ config DRM_EXYNOS
>>       select DRM_DISPLAY_HELPER if DRM_EXYNOS_DP
>>       select DRM_KMS_HELPER
>>       select VIDEOMODE_HELPERS
>> -    select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
>> +    select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>>       select SND_SOC_HDMI_CODEC if SND_SOC
>>       help
>>         Choose this option if you have a Samsung SoC Exynos chipset.
>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c 
>> b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>> index 4ccb385aff52..a379c8ca435a 100644
>> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>> @@ -49,9 +49,9 @@ static void exynos_drm_fb_destroy(struct fb_info *info)
>>
>>   static const struct fb_ops exynos_drm_fb_ops = {
>>       .owner        = THIS_MODULE,
>> -    __FB_DEFAULT_DMA_OPS_RDWR,
>> +    __FB_DEFAULT_DMAMEM_OPS_RDWR,
>>       DRM_FB_HELPER_DEFAULT_OPS,
>> -    __FB_DEFAULT_DMA_OPS_DRAW,
>> +    __FB_DEFAULT_DMAMEM_OPS_DRAW,
>>       .fb_mmap        = exynos_drm_fb_mmap,
>>       .fb_destroy    = exynos_drm_fb_destroy,
>>   };
>> diff --git a/drivers/gpu/drm/omapdrm/Kconfig 
>> b/drivers/gpu/drm/omapdrm/Kconfig
>> index d3c4877e465c..b715301ec79f 100644
>> --- a/drivers/gpu/drm/omapdrm/Kconfig
>> +++ b/drivers/gpu/drm/omapdrm/Kconfig
>> @@ -4,7 +4,7 @@ config DRM_OMAP
>>       depends on DRM && OF
>>       depends on ARCH_OMAP2PLUS
>>       select DRM_KMS_HELPER
>> -    select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
>> +    select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>>       select VIDEOMODE_HELPERS
>>       select HDMI
>>       default n
>> diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c 
>> b/drivers/gpu/drm/omapdrm/omap_fbdev.c
>> index 5b33c789e17a..6b08b137af1a 100644
>> --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
>> +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
>> @@ -106,13 +106,13 @@ static void omap_fbdev_fb_destroy(struct fb_info 
>> *info)
>>
>>   static const struct fb_ops omap_fb_ops = {
>>       .owner = THIS_MODULE,
>> -    __FB_DEFAULT_DMA_OPS_RDWR,
>> +    __FB_DEFAULT_DMAMEM_OPS_RDWR,
>>       .fb_check_var    = drm_fb_helper_check_var,
>>       .fb_set_par    = drm_fb_helper_set_par,
>>       .fb_setcmap    = drm_fb_helper_setcmap,
>>       .fb_blank    = drm_fb_helper_blank,
>>       .fb_pan_display = omap_fbdev_pan_display,
>> -    __FB_DEFAULT_DMA_OPS_DRAW,
>> +    __FB_DEFAULT_DMAMEM_OPS_DRAW,
>>       .fb_ioctl    = drm_fb_helper_ioctl,
>>       .fb_mmap    = omap_fbdev_fb_mmap,
>>       .fb_destroy    = omap_fbdev_fb_destroy,
>> diff --git a/drivers/gpu/drm/tegra/Kconfig 
>> b/drivers/gpu/drm/tegra/Kconfig
>> index 39452c8480c1..84e7e6bc3a0c 100644
>> --- a/drivers/gpu/drm/tegra/Kconfig
>> +++ b/drivers/gpu/drm/tegra/Kconfig
>> @@ -12,7 +12,7 @@ config DRM_TEGRA
>>       select DRM_KMS_HELPER
>>       select DRM_MIPI_DSI
>>       select DRM_PANEL
>> -    select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
>> +    select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>>       select TEGRA_HOST1X
>>       select INTERCONNECT
>>       select IOMMU_IOVA
>> diff --git a/drivers/gpu/drm/tegra/fbdev.c 
>> b/drivers/gpu/drm/tegra/fbdev.c
>> index 206a399c42d6..db6eaac3d30e 100644
>> --- a/drivers/gpu/drm/tegra/fbdev.c
>> +++ b/drivers/gpu/drm/tegra/fbdev.c
>> @@ -59,9 +59,9 @@ static void tegra_fbdev_fb_destroy(struct fb_info 
>> *info)
>>
>>   static const struct fb_ops tegra_fb_ops = {
>>       .owner = THIS_MODULE,
>> -    __FB_DEFAULT_DMA_OPS_RDWR,
>> +    __FB_DEFAULT_DMAMEM_OPS_RDWR,
>>       DRM_FB_HELPER_DEFAULT_OPS,
>> -    __FB_DEFAULT_DMA_OPS_DRAW,
>> +    __FB_DEFAULT_DMAMEM_OPS_DRAW,
>>       .fb_mmap = tegra_fb_mmap,
>>       .fb_destroy = tegra_fbdev_fb_destroy,
>>   };
>> diff --git a/drivers/video/fbdev/core/Kconfig 
>> b/drivers/video/fbdev/core/Kconfig
>> index 28e771a46df6..baf7e852c75b 100644
>> --- a/drivers/video/fbdev/core/Kconfig
>> +++ b/drivers/video/fbdev/core/Kconfig
>> @@ -136,7 +136,7 @@ config FB_DEFERRED_IO
>>       bool
>>       depends on FB_CORE
>>
>> -config FB_DMA_HELPERS
>> +config FB_DMAMEM_HELPERS
>>       bool
>>       depends on FB_CORE
>>       select FB_SYS_COPYAREA
>> diff --git a/include/linux/fb.h b/include/linux/fb.h
>> index 76472482dc30..d255263c2d1d 100644
>> --- a/include/linux/fb.h
>> +++ b/include/linux/fb.h
>> @@ -579,11 +579,11 @@ extern ssize_t fb_sys_write(struct fb_info 
>> *info, const char __user *buf,
>>    * Helpers for framebuffers in DMA-able memory
>>    */
>>
>> -#define __FB_DEFAULT_DMA_OPS_RDWR \
>> +#define __FB_DEFAULT_DMAMEM_OPS_RDWR \
>>       .fb_read    = fb_sys_read, \
>>       .fb_write    = fb_sys_write
>>
>> -#define __FB_DEFAULT_DMA_OPS_DRAW \
>> +#define __FB_DEFAULT_DMAMEM_OPS_DRAW \
>>       .fb_fillrect    = sys_fillrect, \
>>       .fb_copyarea    = sys_copyarea, \
>>       .fb_imageblit    = sys_imageblit
>
Helge Deller July 31, 2023, 7:53 a.m. UTC | #3
On 7/31/23 09:30, Thomas Zimmermann wrote:
> Hi
>
> Am 30.07.23 um 18:20 schrieb Helge Deller:
>> On 7/29/23 21:26, Thomas Zimmermann wrote:
>>> Change the infix for fbdev's DMA-memory helpers from _DMA_ to
>>> _DMAMEM_. The helpers perform operations within DMA-able memory,
>>
>> Since "DMA" stands for "Direct Memory Access", people already
>> know that it operates on memory. I don't think we need
>> to add "MEM" here.
>> So, maybe we should drop this patch and just keep "DMA"?
>
> I think I'd rather leave it to DMAMEM. It's a bit redundant, but it's
> consistent with the other names and it's clear.  Otherwise, someone
> might thing these helpers are for using DMA engines of some kind.

Ok for me.

Thanks!
Helge

>
> Best regards
> Thomas
>
>>
>> Other than that you patch series looks good!
>> Acked-by: Helge Deller <deller@gmx.de>
>>
>> Helge
>>
>>
>>> but they don't perform DMA operations. Naming should make this
>>> clear. Adapt all users. No functional changes.
>>>
>>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
>>> ---
>>>   drivers/gpu/drm/Kconfig                   | 2 +-
>>>   drivers/gpu/drm/drm_fbdev_dma.c           | 4 ++--
>>>   drivers/gpu/drm/exynos/Kconfig            | 2 +-
>>>   drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 ++--
>>>   drivers/gpu/drm/omapdrm/Kconfig           | 2 +-
>>>   drivers/gpu/drm/omapdrm/omap_fbdev.c      | 4 ++--
>>>   drivers/gpu/drm/tegra/Kconfig             | 2 +-
>>>   drivers/gpu/drm/tegra/fbdev.c             | 4 ++--
>>>   drivers/video/fbdev/core/Kconfig          | 2 +-
>>>   include/linux/fb.h                        | 4 ++--
>>>   10 files changed, 15 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
>>> index 34da733e8606..b51c6a141dfa 100644
>>> --- a/drivers/gpu/drm/Kconfig
>>> +++ b/drivers/gpu/drm/Kconfig
>>> @@ -224,7 +224,7 @@ config DRM_TTM_HELPER
>>>   config DRM_GEM_DMA_HELPER
>>>       tristate
>>>       depends on DRM
>>> -    select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
>>> +    select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>>>       help
>>>         Choose this if you need the GEM DMA helper functions
>>>
>>> diff --git a/drivers/gpu/drm/drm_fbdev_dma.c b/drivers/gpu/drm/drm_fbdev_dma.c
>>> index 6db168f94290..6c9427bb4053 100644
>>> --- a/drivers/gpu/drm/drm_fbdev_dma.c
>>> +++ b/drivers/gpu/drm/drm_fbdev_dma.c
>>> @@ -62,9 +62,9 @@ static const struct fb_ops drm_fbdev_dma_fb_ops = {
>>>       .owner = THIS_MODULE,
>>>       .fb_open = drm_fbdev_dma_fb_open,
>>>       .fb_release = drm_fbdev_dma_fb_release,
>>> -    __FB_DEFAULT_DMA_OPS_RDWR,
>>> +    __FB_DEFAULT_DMAMEM_OPS_RDWR,
>>>       DRM_FB_HELPER_DEFAULT_OPS,
>>> -    __FB_DEFAULT_DMA_OPS_DRAW,
>>> +    __FB_DEFAULT_DMAMEM_OPS_DRAW,
>>>       .fb_mmap = drm_fbdev_dma_fb_mmap,
>>>       .fb_destroy = drm_fbdev_dma_fb_destroy,
>>>   };
>>> diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
>>> index 661b42ad4873..733b109a5095 100644
>>> --- a/drivers/gpu/drm/exynos/Kconfig
>>> +++ b/drivers/gpu/drm/exynos/Kconfig
>>> @@ -7,7 +7,7 @@ config DRM_EXYNOS
>>>       select DRM_DISPLAY_HELPER if DRM_EXYNOS_DP
>>>       select DRM_KMS_HELPER
>>>       select VIDEOMODE_HELPERS
>>> -    select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
>>> +    select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>>>       select SND_SOC_HDMI_CODEC if SND_SOC
>>>       help
>>>         Choose this option if you have a Samsung SoC Exynos chipset.
>>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>>> index 4ccb385aff52..a379c8ca435a 100644
>>> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>>> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
>>> @@ -49,9 +49,9 @@ static void exynos_drm_fb_destroy(struct fb_info *info)
>>>
>>>   static const struct fb_ops exynos_drm_fb_ops = {
>>>       .owner        = THIS_MODULE,
>>> -    __FB_DEFAULT_DMA_OPS_RDWR,
>>> +    __FB_DEFAULT_DMAMEM_OPS_RDWR,
>>>       DRM_FB_HELPER_DEFAULT_OPS,
>>> -    __FB_DEFAULT_DMA_OPS_DRAW,
>>> +    __FB_DEFAULT_DMAMEM_OPS_DRAW,
>>>       .fb_mmap        = exynos_drm_fb_mmap,
>>>       .fb_destroy    = exynos_drm_fb_destroy,
>>>   };
>>> diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
>>> index d3c4877e465c..b715301ec79f 100644
>>> --- a/drivers/gpu/drm/omapdrm/Kconfig
>>> +++ b/drivers/gpu/drm/omapdrm/Kconfig
>>> @@ -4,7 +4,7 @@ config DRM_OMAP
>>>       depends on DRM && OF
>>>       depends on ARCH_OMAP2PLUS
>>>       select DRM_KMS_HELPER
>>> -    select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
>>> +    select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>>>       select VIDEOMODE_HELPERS
>>>       select HDMI
>>>       default n
>>> diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
>>> index 5b33c789e17a..6b08b137af1a 100644
>>> --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
>>> +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
>>> @@ -106,13 +106,13 @@ static void omap_fbdev_fb_destroy(struct fb_info *info)
>>>
>>>   static const struct fb_ops omap_fb_ops = {
>>>       .owner = THIS_MODULE,
>>> -    __FB_DEFAULT_DMA_OPS_RDWR,
>>> +    __FB_DEFAULT_DMAMEM_OPS_RDWR,
>>>       .fb_check_var    = drm_fb_helper_check_var,
>>>       .fb_set_par    = drm_fb_helper_set_par,
>>>       .fb_setcmap    = drm_fb_helper_setcmap,
>>>       .fb_blank    = drm_fb_helper_blank,
>>>       .fb_pan_display = omap_fbdev_pan_display,
>>> -    __FB_DEFAULT_DMA_OPS_DRAW,
>>> +    __FB_DEFAULT_DMAMEM_OPS_DRAW,
>>>       .fb_ioctl    = drm_fb_helper_ioctl,
>>>       .fb_mmap    = omap_fbdev_fb_mmap,
>>>       .fb_destroy    = omap_fbdev_fb_destroy,
>>> diff --git a/drivers/gpu/drm/tegra/Kconfig b/drivers/gpu/drm/tegra/Kconfig
>>> index 39452c8480c1..84e7e6bc3a0c 100644
>>> --- a/drivers/gpu/drm/tegra/Kconfig
>>> +++ b/drivers/gpu/drm/tegra/Kconfig
>>> @@ -12,7 +12,7 @@ config DRM_TEGRA
>>>       select DRM_KMS_HELPER
>>>       select DRM_MIPI_DSI
>>>       select DRM_PANEL
>>> -    select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
>>> +    select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
>>>       select TEGRA_HOST1X
>>>       select INTERCONNECT
>>>       select IOMMU_IOVA
>>> diff --git a/drivers/gpu/drm/tegra/fbdev.c b/drivers/gpu/drm/tegra/fbdev.c
>>> index 206a399c42d6..db6eaac3d30e 100644
>>> --- a/drivers/gpu/drm/tegra/fbdev.c
>>> +++ b/drivers/gpu/drm/tegra/fbdev.c
>>> @@ -59,9 +59,9 @@ static void tegra_fbdev_fb_destroy(struct fb_info *info)
>>>
>>>   static const struct fb_ops tegra_fb_ops = {
>>>       .owner = THIS_MODULE,
>>> -    __FB_DEFAULT_DMA_OPS_RDWR,
>>> +    __FB_DEFAULT_DMAMEM_OPS_RDWR,
>>>       DRM_FB_HELPER_DEFAULT_OPS,
>>> -    __FB_DEFAULT_DMA_OPS_DRAW,
>>> +    __FB_DEFAULT_DMAMEM_OPS_DRAW,
>>>       .fb_mmap = tegra_fb_mmap,
>>>       .fb_destroy = tegra_fbdev_fb_destroy,
>>>   };
>>> diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig
>>> index 28e771a46df6..baf7e852c75b 100644
>>> --- a/drivers/video/fbdev/core/Kconfig
>>> +++ b/drivers/video/fbdev/core/Kconfig
>>> @@ -136,7 +136,7 @@ config FB_DEFERRED_IO
>>>       bool
>>>       depends on FB_CORE
>>>
>>> -config FB_DMA_HELPERS
>>> +config FB_DMAMEM_HELPERS
>>>       bool
>>>       depends on FB_CORE
>>>       select FB_SYS_COPYAREA
>>> diff --git a/include/linux/fb.h b/include/linux/fb.h
>>> index 76472482dc30..d255263c2d1d 100644
>>> --- a/include/linux/fb.h
>>> +++ b/include/linux/fb.h
>>> @@ -579,11 +579,11 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
>>>    * Helpers for framebuffers in DMA-able memory
>>>    */
>>>
>>> -#define __FB_DEFAULT_DMA_OPS_RDWR \
>>> +#define __FB_DEFAULT_DMAMEM_OPS_RDWR \
>>>       .fb_read    = fb_sys_read, \
>>>       .fb_write    = fb_sys_write
>>>
>>> -#define __FB_DEFAULT_DMA_OPS_DRAW \
>>> +#define __FB_DEFAULT_DMAMEM_OPS_DRAW \
>>>       .fb_fillrect    = sys_fillrect, \
>>>       .fb_copyarea    = sys_copyarea, \
>>>       .fb_imageblit    = sys_imageblit
>>
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 34da733e8606..b51c6a141dfa 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -224,7 +224,7 @@  config DRM_TTM_HELPER
 config DRM_GEM_DMA_HELPER
 	tristate
 	depends on DRM
-	select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
+	select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
 	help
 	  Choose this if you need the GEM DMA helper functions
 
diff --git a/drivers/gpu/drm/drm_fbdev_dma.c b/drivers/gpu/drm/drm_fbdev_dma.c
index 6db168f94290..6c9427bb4053 100644
--- a/drivers/gpu/drm/drm_fbdev_dma.c
+++ b/drivers/gpu/drm/drm_fbdev_dma.c
@@ -62,9 +62,9 @@  static const struct fb_ops drm_fbdev_dma_fb_ops = {
 	.owner = THIS_MODULE,
 	.fb_open = drm_fbdev_dma_fb_open,
 	.fb_release = drm_fbdev_dma_fb_release,
-	__FB_DEFAULT_DMA_OPS_RDWR,
+	__FB_DEFAULT_DMAMEM_OPS_RDWR,
 	DRM_FB_HELPER_DEFAULT_OPS,
-	__FB_DEFAULT_DMA_OPS_DRAW,
+	__FB_DEFAULT_DMAMEM_OPS_DRAW,
 	.fb_mmap = drm_fbdev_dma_fb_mmap,
 	.fb_destroy = drm_fbdev_dma_fb_destroy,
 };
diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index 661b42ad4873..733b109a5095 100644
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -7,7 +7,7 @@  config DRM_EXYNOS
 	select DRM_DISPLAY_HELPER if DRM_EXYNOS_DP
 	select DRM_KMS_HELPER
 	select VIDEOMODE_HELPERS
-	select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
+	select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
 	select SND_SOC_HDMI_CODEC if SND_SOC
 	help
 	  Choose this option if you have a Samsung SoC Exynos chipset.
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index 4ccb385aff52..a379c8ca435a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@ -49,9 +49,9 @@  static void exynos_drm_fb_destroy(struct fb_info *info)
 
 static const struct fb_ops exynos_drm_fb_ops = {
 	.owner		= THIS_MODULE,
-	__FB_DEFAULT_DMA_OPS_RDWR,
+	__FB_DEFAULT_DMAMEM_OPS_RDWR,
 	DRM_FB_HELPER_DEFAULT_OPS,
-	__FB_DEFAULT_DMA_OPS_DRAW,
+	__FB_DEFAULT_DMAMEM_OPS_DRAW,
 	.fb_mmap        = exynos_drm_fb_mmap,
 	.fb_destroy	= exynos_drm_fb_destroy,
 };
diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
index d3c4877e465c..b715301ec79f 100644
--- a/drivers/gpu/drm/omapdrm/Kconfig
+++ b/drivers/gpu/drm/omapdrm/Kconfig
@@ -4,7 +4,7 @@  config DRM_OMAP
 	depends on DRM && OF
 	depends on ARCH_OMAP2PLUS
 	select DRM_KMS_HELPER
-	select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
+	select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
 	select VIDEOMODE_HELPERS
 	select HDMI
 	default n
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 5b33c789e17a..6b08b137af1a 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -106,13 +106,13 @@  static void omap_fbdev_fb_destroy(struct fb_info *info)
 
 static const struct fb_ops omap_fb_ops = {
 	.owner = THIS_MODULE,
-	__FB_DEFAULT_DMA_OPS_RDWR,
+	__FB_DEFAULT_DMAMEM_OPS_RDWR,
 	.fb_check_var	= drm_fb_helper_check_var,
 	.fb_set_par	= drm_fb_helper_set_par,
 	.fb_setcmap	= drm_fb_helper_setcmap,
 	.fb_blank	= drm_fb_helper_blank,
 	.fb_pan_display = omap_fbdev_pan_display,
-	__FB_DEFAULT_DMA_OPS_DRAW,
+	__FB_DEFAULT_DMAMEM_OPS_DRAW,
 	.fb_ioctl	= drm_fb_helper_ioctl,
 	.fb_mmap	= omap_fbdev_fb_mmap,
 	.fb_destroy	= omap_fbdev_fb_destroy,
diff --git a/drivers/gpu/drm/tegra/Kconfig b/drivers/gpu/drm/tegra/Kconfig
index 39452c8480c1..84e7e6bc3a0c 100644
--- a/drivers/gpu/drm/tegra/Kconfig
+++ b/drivers/gpu/drm/tegra/Kconfig
@@ -12,7 +12,7 @@  config DRM_TEGRA
 	select DRM_KMS_HELPER
 	select DRM_MIPI_DSI
 	select DRM_PANEL
-	select FB_DMA_HELPERS if DRM_FBDEV_EMULATION
+	select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
 	select TEGRA_HOST1X
 	select INTERCONNECT
 	select IOMMU_IOVA
diff --git a/drivers/gpu/drm/tegra/fbdev.c b/drivers/gpu/drm/tegra/fbdev.c
index 206a399c42d6..db6eaac3d30e 100644
--- a/drivers/gpu/drm/tegra/fbdev.c
+++ b/drivers/gpu/drm/tegra/fbdev.c
@@ -59,9 +59,9 @@  static void tegra_fbdev_fb_destroy(struct fb_info *info)
 
 static const struct fb_ops tegra_fb_ops = {
 	.owner = THIS_MODULE,
-	__FB_DEFAULT_DMA_OPS_RDWR,
+	__FB_DEFAULT_DMAMEM_OPS_RDWR,
 	DRM_FB_HELPER_DEFAULT_OPS,
-	__FB_DEFAULT_DMA_OPS_DRAW,
+	__FB_DEFAULT_DMAMEM_OPS_DRAW,
 	.fb_mmap = tegra_fb_mmap,
 	.fb_destroy = tegra_fbdev_fb_destroy,
 };
diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig
index 28e771a46df6..baf7e852c75b 100644
--- a/drivers/video/fbdev/core/Kconfig
+++ b/drivers/video/fbdev/core/Kconfig
@@ -136,7 +136,7 @@  config FB_DEFERRED_IO
 	bool
 	depends on FB_CORE
 
-config FB_DMA_HELPERS
+config FB_DMAMEM_HELPERS
 	bool
 	depends on FB_CORE
 	select FB_SYS_COPYAREA
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 76472482dc30..d255263c2d1d 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -579,11 +579,11 @@  extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
  * Helpers for framebuffers in DMA-able memory
  */
 
-#define __FB_DEFAULT_DMA_OPS_RDWR \
+#define __FB_DEFAULT_DMAMEM_OPS_RDWR \
 	.fb_read	= fb_sys_read, \
 	.fb_write	= fb_sys_write
 
-#define __FB_DEFAULT_DMA_OPS_DRAW \
+#define __FB_DEFAULT_DMAMEM_OPS_DRAW \
 	.fb_fillrect	= sys_fillrect, \
 	.fb_copyarea	= sys_copyarea, \
 	.fb_imageblit	= sys_imageblit