Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+15 -15
+1 -1
drivers/gpu/drm/Kconfig
··· 224 224 config DRM_GEM_DMA_HELPER 225 225 tristate 226 226 depends on DRM 227 - select FB_DMA_HELPERS if DRM_FBDEV_EMULATION 227 + select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION 228 228 help 229 229 Choose this if you need the GEM DMA helper functions 230 230
+2 -2
drivers/gpu/drm/drm_fbdev_dma.c
··· 62 62 .owner = THIS_MODULE, 63 63 .fb_open = drm_fbdev_dma_fb_open, 64 64 .fb_release = drm_fbdev_dma_fb_release, 65 - __FB_DEFAULT_DMA_OPS_RDWR, 65 + __FB_DEFAULT_DMAMEM_OPS_RDWR, 66 66 DRM_FB_HELPER_DEFAULT_OPS, 67 - __FB_DEFAULT_DMA_OPS_DRAW, 67 + __FB_DEFAULT_DMAMEM_OPS_DRAW, 68 68 .fb_mmap = drm_fbdev_dma_fb_mmap, 69 69 .fb_destroy = drm_fbdev_dma_fb_destroy, 70 70 };
+1 -1
drivers/gpu/drm/exynos/Kconfig
··· 7 7 select DRM_DISPLAY_HELPER if DRM_EXYNOS_DP 8 8 select DRM_KMS_HELPER 9 9 select VIDEOMODE_HELPERS 10 - select FB_DMA_HELPERS if DRM_FBDEV_EMULATION 10 + select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION 11 11 select SND_SOC_HDMI_CODEC if SND_SOC 12 12 help 13 13 Choose this option if you have a Samsung SoC Exynos chipset.
+2 -2
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
··· 49 49 50 50 static const struct fb_ops exynos_drm_fb_ops = { 51 51 .owner = THIS_MODULE, 52 - __FB_DEFAULT_DMA_OPS_RDWR, 52 + __FB_DEFAULT_DMAMEM_OPS_RDWR, 53 53 DRM_FB_HELPER_DEFAULT_OPS, 54 - __FB_DEFAULT_DMA_OPS_DRAW, 54 + __FB_DEFAULT_DMAMEM_OPS_DRAW, 55 55 .fb_mmap = exynos_drm_fb_mmap, 56 56 .fb_destroy = exynos_drm_fb_destroy, 57 57 };
+1 -1
drivers/gpu/drm/omapdrm/Kconfig
··· 4 4 depends on DRM && OF 5 5 depends on ARCH_OMAP2PLUS 6 6 select DRM_KMS_HELPER 7 - select FB_DMA_HELPERS if DRM_FBDEV_EMULATION 7 + select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION 8 8 select VIDEOMODE_HELPERS 9 9 select HDMI 10 10 default n
+2 -2
drivers/gpu/drm/omapdrm/omap_fbdev.c
··· 106 106 107 107 static const struct fb_ops omap_fb_ops = { 108 108 .owner = THIS_MODULE, 109 - __FB_DEFAULT_DMA_OPS_RDWR, 109 + __FB_DEFAULT_DMAMEM_OPS_RDWR, 110 110 .fb_check_var = drm_fb_helper_check_var, 111 111 .fb_set_par = drm_fb_helper_set_par, 112 112 .fb_setcmap = drm_fb_helper_setcmap, 113 113 .fb_blank = drm_fb_helper_blank, 114 114 .fb_pan_display = omap_fbdev_pan_display, 115 - __FB_DEFAULT_DMA_OPS_DRAW, 115 + __FB_DEFAULT_DMAMEM_OPS_DRAW, 116 116 .fb_ioctl = drm_fb_helper_ioctl, 117 117 .fb_mmap = omap_fbdev_fb_mmap, 118 118 .fb_destroy = omap_fbdev_fb_destroy,
+1 -1
drivers/gpu/drm/tegra/Kconfig
··· 12 12 select DRM_KMS_HELPER 13 13 select DRM_MIPI_DSI 14 14 select DRM_PANEL 15 - select FB_DMA_HELPERS if DRM_FBDEV_EMULATION 15 + select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION 16 16 select TEGRA_HOST1X 17 17 select INTERCONNECT 18 18 select IOMMU_IOVA
+2 -2
drivers/gpu/drm/tegra/fbdev.c
··· 59 59 60 60 static const struct fb_ops tegra_fb_ops = { 61 61 .owner = THIS_MODULE, 62 - __FB_DEFAULT_DMA_OPS_RDWR, 62 + __FB_DEFAULT_DMAMEM_OPS_RDWR, 63 63 DRM_FB_HELPER_DEFAULT_OPS, 64 - __FB_DEFAULT_DMA_OPS_DRAW, 64 + __FB_DEFAULT_DMAMEM_OPS_DRAW, 65 65 .fb_mmap = tegra_fb_mmap, 66 66 .fb_destroy = tegra_fbdev_fb_destroy, 67 67 };
+1 -1
drivers/video/fbdev/core/Kconfig
··· 136 136 bool 137 137 depends on FB_CORE 138 138 139 - config FB_DMA_HELPERS 139 + config FB_DMAMEM_HELPERS 140 140 bool 141 141 depends on FB_CORE 142 142 select FB_SYS_COPYAREA
+2 -2
include/linux/fb.h
··· 579 579 * Helpers for framebuffers in DMA-able memory 580 580 */ 581 581 582 - #define __FB_DEFAULT_DMA_OPS_RDWR \ 582 + #define __FB_DEFAULT_DMAMEM_OPS_RDWR \ 583 583 .fb_read = fb_sys_read, \ 584 584 .fb_write = fb_sys_write 585 585 586 - #define __FB_DEFAULT_DMA_OPS_DRAW \ 586 + #define __FB_DEFAULT_DMAMEM_OPS_DRAW \ 587 587 .fb_fillrect = sys_fillrect, \ 588 588 .fb_copyarea = sys_copyarea, \ 589 589 .fb_imageblit = sys_imageblit