fbdev: Use _DMAMEM_ infix for DMA-memory helpers

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>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Helge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230729193157.15446-4-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 34da733e8606857236cfc2e47068e229d9934659..b51c6a141dfad1466ffa2c07c23ea390b6c7a275 100644 (file)
--- 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 6db168f94290cb817eee7df664cd196b76959ca1..6c9427bb4053ba4b9d130a8d6adc9151b3b61e80 100644 (file)
--- 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 661b42ad48733e66f5a2d853c8e8e33dafaf6780..733b109a509525f7c17bd69fe2e534073cb796e8 100644 (file)
--- 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 4ccb385aff5299374c01d30787597b6c362e1d07..a379c8ca435a334d52ae4d8c7adf17d2a76fa246 100644 (file)
--- 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 d3c4877e465ce360967ea0fb67f6851a29506abf..b715301ec79f66d5cee22f7d0ea12ccd5568a673 100644 (file)
--- 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 5b33c789e17a8c79a8927bcdc7b1b3b0228b0e80..6b08b137af1ad8847cae2f7bb5e4c5651f5c1151 100644 (file)
--- 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 39452c8480c130127bdf29e2ce035f8e9840ccce..84e7e6bc3a0c18e53b90dac29a4d69c568c65875 100644 (file)
--- 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 206a399c42d6ef78ed59a9f6fdddd173743c8aa1..db6eaac3d30e63cf39c0cb072083b7e09ba85a1c 100644 (file)
--- 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 28e771a46df62c03fedb42dc243e0e2d58c80c2c..baf7e852c75b60972ab24ddc10ac773b1a1dbf96 100644 (file)
--- 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 76472482dc30637bbced12333ef44ff79da3502c..d255263c2d1d6e0bf8b3ce0cf5ac12e37b51a986 100644 (file)
--- 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