fbdev: Rename helpers for struct fb_ops
Subsystems (15)
Thomas Zimmermann
maintainercover fbdev: Rename helpers for struct fb_ops
As discussed at [1], rename helpers for struct fb_ops to include 'MEM' in their name to signal that these helpers operate on a certain type of memory address; either I/O, system or DMA-able ranges. These are trival renames without any functional changes.
[1] https://lore.kernel.org/dri-devel/[email protected]/T/#mcb92691d6131333782cc83190a5fc00bd575a0c5
Thomas Zimmermann (4):
fbdev: Use _IOMEM_ infix for I/O-memory helpers
fbdev: Use _SYSMEM_ infix for system-memory helpers
fbdev: Use _DMAMEM_ infix for DMA-memory helpers
fbdev: Align deferred I/O with naming of helpers
drivers/gpu/drm/Kconfig | 4 ++-- drivers/gpu/drm/armada/Kconfig | 2 +- drivers/gpu/drm/armada/armada_fbdev.c | 2 +- drivers/gpu/drm/drm_fbdev_dma.c | 4 ++-- drivers/gpu/drm/drm_fbdev_generic.c | 6 ++--- drivers/gpu/drm/exynos/Kconfig | 2 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 ++-- drivers/gpu/drm/gma500/Kconfig | 2 +- drivers/gpu/drm/gma500/fbdev.c | 4 ++-- drivers/gpu/drm/i915/Kconfig | 2 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 6 ++--- drivers/gpu/drm/msm/Kconfig | 2 +- drivers/gpu/drm/msm/msm_fbdev.c | 6 ++--- drivers/gpu/drm/omapdrm/Kconfig | 2 +- drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 ++-- drivers/gpu/drm/radeon/Kconfig | 2 +- drivers/gpu/drm/radeon/radeon_fbdev.c | 2 +- drivers/gpu/drm/tegra/Kconfig | 2 +- drivers/gpu/drm/tegra/fbdev.c | 4 ++-- drivers/video/fbdev/Kconfig | 10 ++++----- drivers/video/fbdev/broadsheetfb.c | 6 ++--- drivers/video/fbdev/core/Kconfig | 10 ++++----- drivers/video/fbdev/hecubafb.c | 6 ++--- drivers/video/fbdev/metronomefb.c | 6 ++--- drivers/video/fbdev/ssd1307fb.c | 6 ++--- drivers/video/fbdev/xen-fbfront.c | 6 ++--- include/linux/fb.h | 26 +++++++++++----------- 27 files changed, 69 insertions(+), 69 deletions(-)
base-commit: fba8a13ec9ae1a7175cc0dda7235b3d2df0f0f90
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH 1/4 fbdev: Use _IOMEM_ infix for I/O-memory helpers
Change the infix for fbdev's I/O-memory helpers from _IO_ to _IOMEM_ to distiguish them from other types of I/O, such as file operations. The helpers operate on memory ranges in the I/O address space and the naming should make this clear. Adapt all users. No functional changes.
--- drivers/gpu/drm/armada/Kconfig | 2 +- drivers/gpu/drm/armada/armada_fbdev.c | 2 +- drivers/gpu/drm/gma500/Kconfig | 2 +- drivers/gpu/drm/gma500/fbdev.c | 4 ++-- drivers/gpu/drm/i915/Kconfig | 2 +- drivers/gpu/drm/radeon/Kconfig | 2 +- drivers/gpu/drm/radeon/radeon_fbdev.c | 2 +- drivers/video/fbdev/core/Kconfig | 2 +- include/linux/fb.h | 14 +++++++------- 9 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/armada/Kconfig +1 -1
@@ -3,7 +3,7 @@ config DRM_ARMADA tristate "DRM support for Marvell Armada SoCs" depends on DRM && HAVE_CLK && ARM && MMU select DRM_KMS_HELPER - select FB_IO_HELPERS if DRM_FBDEV_EMULATION + select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION help Support the "LCD" controllers found on the Marvell Armada 510 devices. There are two controllers on the device, each controller
drivers/gpu/drm/armada/armada_fbdev.c +1 -1
@@ -34,7 +34,7 @@ static void armada_fbdev_fb_destroy(struct fb_info *info)static const struct fb_ops armada_fb_ops = { .owner =THIS_MODULE , -FB_DEFAULT_IO_OPS , +FB_DEFAULT_IOMEM_OPS ,DRM_FB_HELPER_DEFAULT_OPS , .fb_destroy = armada_fbdev_fb_destroy, };
drivers/gpu/drm/gma500/Kconfig +1 -1
@@ -3,7 +3,7 @@ config DRM_GMA500 tristate "Intel GMA500/600/3600/3650 KMS Framebuffer" depends on DRM && PCI && X86 && MMU select DRM_KMS_HELPER - select FB_IO_HELPERS if DRM_FBDEV_EMULATION + select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION select I2C select I2C_ALGOBIT # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915
drivers/gpu/drm/gma500/fbdev.c +2 -2
@@ -135,10 +135,10 @@ static void psb_fbdev_fb_destroy(struct fb_info *info)static const struct fb_ops psb_fbdev_fb_ops = { .owner =THIS_MODULE , - __FB_DEFAULT_IO_OPS_RDWR, + __FB_DEFAULT_IOMEM_OPS_RDWR,DRM_FB_HELPER_DEFAULT_OPS , .fb_setcolreg = psb_fbdev_fb_setcolreg, - __FB_DEFAULT_IO_OPS_DRAW, + __FB_DEFAULT_IOMEM_OPS_DRAW, .fb_mmap = psb_fbdev_fb_mmap, .fb_destroy = psb_fbdev_fb_destroy, };
drivers/gpu/drm/i915/Kconfig +1 -1
@@ -17,7 +17,7 @@ config DRM_I915 select DRM_KMS_HELPER select DRM_PANEL select DRM_MIPI_DSI - select FB_IO_HELPERS if DRM_FBDEV_EMULATION + select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION select RELAY select I2C select I2C_ALGOBIT
drivers/gpu/drm/radeon/Kconfig +1 -1
@@ -11,7 +11,7 @@ config DRM_RADEON select DRM_SUBALLOC_HELPER select DRM_TTM select DRM_TTM_HELPER - select FB_IO_HELPERS if DRM_FBDEV_EMULATION + select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION select SND_HDA_COMPONENT if SND_HDA_CORE select POWER_SUPPLY select HWMON
drivers/gpu/drm/radeon/radeon_fbdev.c +1 -1
@@ -193,7 +193,7 @@ static const struct fb_ops radeon_fbdev_fb_ops = { .owner = THIS_MODULE, .fb_open = radeon_fbdev_fb_open, .fb_release = radeon_fbdev_fb_release, -FB_DEFAULT_IO_OPS , +FB_DEFAULT_IOMEM_OPS ,DRM_FB_HELPER_DEFAULT_OPS , .fb_destroy = radeon_fbdev_fb_destroy, };
drivers/video/fbdev/core/Kconfig +1 -1
@@ -144,7 +144,7 @@ config FB_DMA_HELPERS select FB_SYS_FOPS select FB_SYS_IMAGEBLIT -config FB_IO_HELPERS +config FB_IOMEM_HELPERS bool depends on FB_CORE select FB_CFB_COPYAREA
include/linux/fb.h +7 -7
@@ -537,22 +537,22 @@ extern ssize_t fb_io_read(struct fb_info *info, char __user *buf,extern ssize_t fb_io_write (struct fb_info *info,const char __user *buf,size_t count,loff_t *ppos); -#define __FB_DEFAULT_IO_OPS_RDWR \ +#define __FB_DEFAULT_IOMEM_OPS_RDWR \ .fb_read = fb_io_read, \ .fb_write = fb_io_write -#define __FB_DEFAULT_IO_OPS_DRAW \ +#define __FB_DEFAULT_IOMEM_OPS_DRAW \ .fb_fillrect = cfb_fillrect, \ .fb_copyarea = cfb_copyarea, \ .fb_imageblit = cfb_imageblit -#define __FB_DEFAULT_IO_OPS_MMAP \ +#define __FB_DEFAULT_IOMEM_OPS_MMAP \ .fb_mmap = NULL/* default implementation */ -#define FB_DEFAULT_IO_OPS \ - __FB_DEFAULT_IO_OPS_RDWR, \ - __FB_DEFAULT_IO_OPS_DRAW, \ - __FB_DEFAULT_IO_OPS_MMAP +#define FB_DEFAULT_IOMEM_OPS \ + __FB_DEFAULT_IOMEM_OPS_RDWR, \ + __FB_DEFAULT_IOMEM_OPS_DRAW, \ + __FB_DEFAULT_IOMEM_OPS_MMAP/* * Helpers for framebuffers in system memory
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH 2/4 fbdev: Use _SYSMEM_ infix for system-memory helpers
In reply to Thomas ZimmermannChange the infix for fbdev's system-memory helpers from _SYS_ to _SYSMEM_. The helpers perform operations within system memory, but not on the state of the operating system itself. Naming should make this clear. Adapt all users. No functional changes.
--- drivers/gpu/drm/Kconfig | 2 +- drivers/gpu/drm/msm/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 10 +++++----- drivers/video/fbdev/core/Kconfig | 6 +++--- include/linux/fb.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/Kconfig +1 -1
@@ -11,7 +11,7 @@ menuconfig DRM select DRM_PANEL_ORIENTATION_QUIRKS select DRM_KMS_HELPER if DRM_FBDEV_EMULATION select FB_CORE if DRM_FBDEV_EMULATION - select FB_SYS_HELPERS_DEFERRED if DRM_FBDEV_EMULATION + select FB_SYSMEM_HELPERS_DEFERRED if DRM_FBDEV_EMULATION select HDMI select I2C select DMA_SHARED_BUFFER
drivers/gpu/drm/msm/Kconfig +1 -1
@@ -21,7 +21,7 @@ config DRM_MSM select DRM_BRIDGE select DRM_PANEL_BRIDGE select DRM_SCHED - select FB_SYS_HELPERS if DRM_FBDEV_EMULATION + select FB_SYSMEM_HELPERS if DRM_FBDEV_EMULATION select SHMEM select TMPFS select QCOM_SCM
drivers/video/fbdev/Kconfig +5 -5
@@ -48,7 +48,7 @@ menuconfig FB config FB_HECUBA tristate depends on FB - select FB_SYS_HELPERS_DEFERRED + select FB_SYSMEM_HELPERS_DEFERRED config FB_SVGALIB tristate
@@ -1886,7 +1886,7 @@ config FB_VIRTUAL config XEN_FBDEV_FRONTEND tristate "Xen virtual frame buffer support" depends on FB && XEN - select FB_SYS_HELPERS_DEFERRED + select FB_SYSMEM_HELPERS_DEFERRED select XEN_XENBUS_FRONTEND default y help
@@ -1897,7 +1897,7 @@ config XEN_FBDEV_FRONTEND config FB_METRONOME tristate "E-Ink Metronome/8track controller support" depends on FB - select FB_SYS_HELPERS_DEFERRED + select FB_SYSMEM_HELPERS_DEFERRED help This driver implements support for the E-Ink Metronome controller. The pre-release name for this device was 8track
@@ -1979,7 +1979,7 @@ config FB_MX3 config FB_BROADSHEET tristate "E-Ink Broadsheet/Epson S1D13521 controller support" depends on FB && (ARCH_PXA || COMPILE_TEST) - select FB_SYS_HELPERS_DEFERRED + select FB_SYSMEM_HELPERS_DEFERRED help This driver implements support for the E-Ink Broadsheet controller. The release name for this device was Epson S1D13521
@@ -2021,7 +2021,7 @@ config FB_SSD1307 depends on FB && I2C depends on GPIOLIB || COMPILE_TEST select FB_BACKLIGHT - select FB_SYS_HELPERS_DEFERRED + select FB_SYSMEM_HELPERS_DEFERRED help This driver implements support for the Solomon SSD1307 OLED controller over I2C.
drivers/video/fbdev/core/Kconfig +3 -3
@@ -151,7 +151,7 @@ config FB_IOMEM_HELPERS select FB_CFB_FILLRECT select FB_CFB_IMAGEBLIT -config FB_SYS_HELPERS +config FB_SYSMEM_HELPERS bool depends on FB_CORE select FB_SYS_COPYAREA
@@ -159,11 +159,11 @@ config FB_SYS_HELPERS select FB_SYS_FOPS select FB_SYS_IMAGEBLIT -config FB_SYS_HELPERS_DEFERRED +config FB_SYSMEM_HELPERS_DEFERRED bool depends on FB_CORE select FB_DEFERRED_IO - select FB_SYS_HELPERS + select FB_SYSMEM_HELPERS config FB_BACKLIGHT tristate
include/linux/fb.h +2 -2
@@ -566,11 +566,11 @@ extern ssize_t fb_sys_read(struct fb_info *info, char __user *buf,extern ssize_t fb_sys_write (struct fb_info *info,const char __user *buf,size_t count,loff_t *ppos); -#define __FB_DEFAULT_SYS_OPS_RDWR \ +#define __FB_DEFAULT_SYSMEM_OPS_RDWR \ .fb_read = fb_sys_read, \ .fb_write = fb_sys_write -#define __FB_DEFAULT_SYS_OPS_DRAW \ +#define __FB_DEFAULT_SYSMEM_OPS_DRAW \ .fb_fillrect = sys_fillrect, \ .fb_copyarea = sys_copyarea, \ .fb_imageblit = sys_imageblit
Signature · 1 line
2.41.0
Thomas Zimmermann
maintainerPATCH 3/4 fbdev: Use _DMAMEM_ infix for DMA-memory helpers
In reply to Thomas ZimmermannChange 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.
--- 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(-)
drivers/gpu/drm/Kconfig +1 -1
@@ -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
drivers/gpu/drm/drm_fbdev_dma.c +2 -2
@@ -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, };
drivers/gpu/drm/exynos/Kconfig +1 -1
@@ -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.
drivers/gpu/drm/exynos/exynos_drm_fbdev.c +2 -2
@@ -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, };
drivers/gpu/drm/omapdrm/Kconfig +1 -1
@@ -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
drivers/gpu/drm/omapdrm/omap_fbdev.c +2 -2
@@ -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,
drivers/gpu/drm/tegra/Kconfig +1 -1
@@ -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
drivers/gpu/drm/tegra/fbdev.c +2 -2
@@ -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, };
drivers/video/fbdev/core/Kconfig +1 -1
@@ -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
include/linux/fb.h +2 -2
@@ -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
Signature · 1 line
2.41.0
Re: [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers
Quoted 2 lines · Thomas Zimmermann
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!
Helge
Quoted 168 lines
but they don't perform DMA operations. Naming should make this clear. Adapt all users. No functional changes.
Signed-off-by Thomas Zimmermann <[email protected]>--- 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(-)drivers/gpu/drm/Kconfig +1
-1@@ -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 functionsdrivers/gpu/drm/drm_fbdev_dma.c +2
-2@@ -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, };drivers/gpu/drm/exynos/Kconfig +1
-1@@ -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.drivers/gpu/drm/exynos/exynos_drm_fbdev.c +2
-2@@ -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, };drivers/gpu/drm/omapdrm/Kconfig +1
-1@@ -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 ndrivers/gpu/drm/omapdrm/omap_fbdev.c +2
-2@@ -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,drivers/gpu/drm/tegra/Kconfig +1
-1@@ -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_IOVAdrivers/gpu/drm/tegra/fbdev.c +2
-2@@ -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, };drivers/video/fbdev/core/Kconfig +1
-1@@ -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_COPYAREAinclude/linux/fb.h +2
-2@@ -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
maintainerRe: [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers
Hi
Am 30.07.23 um 18:20 schrieb Helge Deller:
Quoted 8 lines · Thomas Zimmermann
Quoted 2 lines
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
Quoted 179 lines
Other than that you patch series looks good!
Acked-by Helge Deller <[email protected]>Helge
Quoted 171 lines
but they don't perform DMA operations. Naming should make this clear. Adapt all users. No functional changes.
Signed-off-by Thomas Zimmermann <[email protected]>---
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(-)drivers/gpu/drm/Kconfig +0
-0@@ -224,7 +224,7 @@ config DRM_TTM_HELPERconfig
DRM_GEM_DMA_HELPER
tristate
depends on DRM
- selectFB_DMA_HELPERSifDRM_FBDEV_EMULATION+ selectFB_DMAMEM_HELPERSifDRM_FBDEV_EMULATIONhelp
Choose this if you need the GEM DMA helper functionsdrivers/gpu/drm/drm_fbdev_dma.c +2
-2@@ -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, };drivers/gpu/drm/exynos/Kconfig +0
-0@@ -7,7 +7,7 @@ config DRM_EXYNOSselect
DRM_DISPLAY_HELPERifDRM_EXYNOS_DP
selectDRM_KMS_HELPER
selectVIDEOMODE_HELPERS
- selectFB_DMA_HELPERSifDRM_FBDEV_EMULATION
+ selectFB_DMAMEM_HELPERSifDRM_FBDEV_EMULATIONselectSND_SOC_HDMI_CODECifSND_SOC
help
Choose this option if you have a Samsung SoC Exynos chipset.drivers/gpu/drm/exynos/exynos_drm_fbdev.c +2
-2@@ -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, };drivers/gpu/drm/omapdrm/Kconfig +0
-0@@ -4,7 +4,7 @@ config DRM_OMAPdepends on DRM && OF
depends onARCH_OMAP2PLUS
selectDRM_KMS_HELPER
- selectFB_DMA_HELPERSifDRM_FBDEV_EMULATION+ selectFB_DMAMEM_HELPERSifDRM_FBDEV_EMULATIONselectVIDEOMODE_HELPERS
select HDMI
default ndrivers/gpu/drm/omapdrm/omap_fbdev.c +2
-2@@ -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,drivers/gpu/drm/tegra/Kconfig +0
-0@@ -12,7 +12,7 @@ config DRM_TEGRAselect
DRM_KMS_HELPER
selectDRM_MIPI_DSI
selectDRM_PANEL
- selectFB_DMA_HELPERSifDRM_FBDEV_EMULATION+ selectFB_DMAMEM_HELPERSifDRM_FBDEV_EMULATIONselectTEGRA_HOST1X
select INTERCONNECT
selectIOMMU_IOVAdrivers/gpu/drm/tegra/fbdev.c +2
-2@@ -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,};
drivers/video/fbdev/core/Kconfig +0
-0@@ -136,7 +136,7 @@ config FB_DEFERRED_IObool
depends onFB_COREdrivers/video/fbdev/core/Kconfig +1
-1-config FB_DMA_HELPERS +config FB_DMAMEM_HELPERSbool
depends onFB_CORE
selectFB_SYS_COPYAREAinclude/linux/fb.h +1
-1@@ -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_writeinclude/linux/fb.h +1
-1-#define __FB_DEFAULT_DMA_OPS_DRAW \ +#define __FB_DEFAULT_DMAMEM_OPS_DRAW \.fb_fillrect =
sys_fillrect, \
.fb_copyarea =sys_copyarea, \
.fb_imageblit =sys_imageblit
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Helge Deller
maintainerRe: [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers
Quoted 7 lines · Thomas Zimmermann
Hi
Am 30.07.23 um 18:20 schrieb Helge Deller:
Quoted 4 lines · Thomas Zimmermann
Quoted 2 lines
Change the infix for fbdev's DMA-memory helpers from _DMA_ to _DMAMEM_. The helpers perform operations within DMA-able memory,
Quoted 8 lines
Quoted 4 lines
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
Quoted 181 lines
Best regards
ThomasQuoted 176 lines
Other than that you patch series looks good!
Acked-by Helge Deller <[email protected]>Helge
Quoted 168 lines
but they don't perform DMA operations. Naming should make this clear. Adapt all users. No functional changes.
Signed-off-by Thomas Zimmermann <[email protected]>---
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(-)drivers/gpu/drm/Kconfig +0
-0@@ -224,7 +224,7 @@ config DRM_TTM_HELPERconfig
DRM_GEM_DMA_HELPER
tristate
depends on DRM
- selectFB_DMA_HELPERSifDRM_FBDEV_EMULATION+ selectFB_DMAMEM_HELPERSifDRM_FBDEV_EMULATIONhelp
Choose this if you need the GEM DMA helper functionsdrivers/gpu/drm/drm_fbdev_dma.c +2
-2@@ -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, };drivers/gpu/drm/exynos/Kconfig +0
-0@@ -7,7 +7,7 @@ config DRM_EXYNOSselect
DRM_DISPLAY_HELPERifDRM_EXYNOS_DP
selectDRM_KMS_HELPER
selectVIDEOMODE_HELPERS
- selectFB_DMA_HELPERSifDRM_FBDEV_EMULATION
+ selectFB_DMAMEM_HELPERSifDRM_FBDEV_EMULATIONselectSND_SOC_HDMI_CODECifSND_SOC
help
Choose this option if you have a Samsung SoC Exynos chipset.drivers/gpu/drm/exynos/exynos_drm_fbdev.c +2
-2@@ -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, };drivers/gpu/drm/omapdrm/Kconfig +0
-0@@ -4,7 +4,7 @@ config DRM_OMAPdepends on DRM && OF
depends onARCH_OMAP2PLUS
selectDRM_KMS_HELPER
- selectFB_DMA_HELPERSifDRM_FBDEV_EMULATION+ selectFB_DMAMEM_HELPERSifDRM_FBDEV_EMULATIONselectVIDEOMODE_HELPERS
select HDMI
default ndrivers/gpu/drm/omapdrm/omap_fbdev.c +2
-2@@ -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,drivers/gpu/drm/tegra/Kconfig +0
-0@@ -12,7 +12,7 @@ config DRM_TEGRAselect
DRM_KMS_HELPER
selectDRM_MIPI_DSI
selectDRM_PANEL
- selectFB_DMA_HELPERSifDRM_FBDEV_EMULATION+ selectFB_DMAMEM_HELPERSifDRM_FBDEV_EMULATIONselectTEGRA_HOST1X
select INTERCONNECT
selectIOMMU_IOVAdrivers/gpu/drm/tegra/fbdev.c +2
-2@@ -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, };drivers/video/fbdev/core/Kconfig +0
-0@@ -136,7 +136,7 @@ config FB_DEFERRED_IObool
depends onFB_COREdrivers/video/fbdev/core/Kconfig +1
-1-config FB_DMA_HELPERS +config FB_DMAMEM_HELPERSbool
depends onFB_CORE
selectFB_SYS_COPYAREAinclude/linux/fb.h +1
-1@@ -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_writeinclude/linux/fb.h +1
-1-#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
maintainerPATCH 4/4 fbdev: Align deferred I/O with naming of helpers
In reply to Thomas ZimmermannDeferred-I/O generator macros generate callbacks for struct fb_ops that operate on memory ranges in I/O address space or system address space. Rename the macros to use the _IOMEM_ and _SYSMEM_ infixes of their underlying helpers. Adapt all users. No functional changes.
--- drivers/gpu/drm/drm_fbdev_generic.c | 6 +++--- drivers/gpu/drm/i915/display/intel_fbdev.c | 6 +++--- drivers/gpu/drm/msm/msm_fbdev.c | 6 +++--- drivers/video/fbdev/broadsheetfb.c | 6 +++--- drivers/video/fbdev/hecubafb.c | 6 +++--- drivers/video/fbdev/metronomefb.c | 6 +++--- drivers/video/fbdev/ssd1307fb.c | 6 +++--- drivers/video/fbdev/xen-fbfront.c | 6 +++--- include/linux/fb.h | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-)
drivers/gpu/drm/drm_fbdev_generic.c +3 -3
@@ -34,9 +34,9 @@ static int drm_fbdev_generic_fb_release(struct fb_info *info, int user)return 0 ; } -FB_GEN_DEFAULT_DEFERRED_SYS_OPS (drm_fbdev_generic, - drm_fb_helper_damage_range, - drm_fb_helper_damage_area); +FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS (drm_fbdev_generic, + drm_fb_helper_damage_range, + drm_fb_helper_damage_area);static void drm_fbdev_generic_fb_destroy (struct fb_info *info) {
drivers/gpu/drm/i915/display/intel_fbdev.c +3 -3
@@ -85,9 +85,9 @@ static void intel_fbdev_invalidate(struct intel_fbdev *ifbdev)intel_frontbuffer_invalidate (to_frontbuffer (ifbdev),ORIGIN_CPU ); } -FB_GEN_DEFAULT_DEFERRED_IO_OPS (intel_fbdev, - drm_fb_helper_damage_range, - drm_fb_helper_damage_area) +FB_GEN_DEFAULT_DEFERRED_IOMEM_OPS (intel_fbdev, + drm_fb_helper_damage_range, + drm_fb_helper_damage_area)static int intel_fbdev_set_par (struct fb_info *info) {
drivers/gpu/drm/msm/msm_fbdev.c +3 -3
@@ -25,9 +25,9 @@ module_param(fbdev, bool, 0600);* fbdev funcs, to implement legacy fbdev interface on top of drm driver */ -FB_GEN_DEFAULT_DEFERRED_SYS_OPS (msm_fbdev, - drm_fb_helper_damage_range, - drm_fb_helper_damage_area) +FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS (msm_fbdev, + drm_fb_helper_damage_range, + drm_fb_helper_damage_area)static int msm_fbdev_mmap (struct fb_info *info,struct vm_area_struct *vma) {
drivers/video/fbdev/broadsheetfb.c +3 -3
@@ -985,9 +985,9 @@ static void broadsheetfb_defio_damage_area(struct fb_info *info, u32 x, u32 y,broadsheetfb_dpy_update (par); } -FB_GEN_DEFAULT_DEFERRED_SYS_OPS (broadsheetfb, - broadsheetfb_defio_damage_range, - broadsheetfb_defio_damage_area) +FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS (broadsheetfb, + broadsheetfb_defio_damage_range, + broadsheetfb_defio_damage_area)static const struct fb_ops broadsheetfb_ops = { .owner =THIS_MODULE ,
drivers/video/fbdev/hecubafb.c +3 -3
@@ -135,9 +135,9 @@ static void hecubafb_defio_damage_area(struct fb_info *info, u32 x, u32 y,hecubafb_dpy_update (par); } -FB_GEN_DEFAULT_DEFERRED_SYS_OPS (hecubafb, - hecubafb_defio_damage_range, - hecubafb_defio_damage_area) +FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS (hecubafb, + hecubafb_defio_damage_range, + hecubafb_defio_damage_area)static const struct fb_ops hecubafb_ops = { .owner =THIS_MODULE ,
drivers/video/fbdev/metronomefb.c +3 -3
@@ -498,9 +498,9 @@ static void metronomefb_defio_damage_area(struct fb_info *info, u32 x, u32 y,metronomefb_dpy_update (par); } -FB_GEN_DEFAULT_DEFERRED_SYS_OPS (metronomefb, - metronomefb_defio_damage_range, - metronomefb_defio_damage_area) +FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS (metronomefb, + metronomefb_defio_damage_range, + metronomefb_defio_damage_area)static const struct fb_ops metronomefb_ops = { .owner =THIS_MODULE ,
drivers/video/fbdev/ssd1307fb.c +3 -3
@@ -317,9 +317,9 @@ static void ssd1307fb_defio_damage_area(struct fb_info *info, u32 x, u32 y,ssd1307fb_update_rect (par, x, y, width, height); } -FB_GEN_DEFAULT_DEFERRED_SYS_OPS (ssd1307fb, - ssd1307fb_defio_damage_range, - ssd1307fb_defio_damage_area) +FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS (ssd1307fb, + ssd1307fb_defio_damage_range, + ssd1307fb_defio_damage_area)static const struct fb_ops ssd1307fb_ops = { .owner =THIS_MODULE ,
drivers/video/fbdev/xen-fbfront.c +3 -3
@@ -306,9 +306,9 @@ static void xenfb_defio_damage_area(struct fb_info *info, u32 x, u32 y,xenfb_refresh (xenfb_info, x, y, width, height); } -FB_GEN_DEFAULT_DEFERRED_SYS_OPS (xenfb, - xenfb_defio_damage_range, - xenfb_defio_damage_area) +FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS (xenfb, + xenfb_defio_damage_range, + xenfb_defio_damage_area)static const struct fb_ops xenfb_fb_ops = { .owner =THIS_MODULE ,
include/linux/fb.h +2 -2
@@ -682,11 +682,11 @@ extern int fb_deferred_io_fsync(struct file *file, loff_t start,__damage_area (info, image->dx, image->dy, image->width, image->height); \ } -#define FB_GEN_DEFAULT_DEFERRED_IO_OPS (__prefix, __damage_range, __damage_area) \ +#define FB_GEN_DEFAULT_DEFERRED_IOMEM_OPS (__prefix, __damage_range, __damage_area) \ __FB_GEN_DEFAULT_DEFERRED_OPS_RDWR(__prefix, __damage_range, io) \ __FB_GEN_DEFAULT_DEFERRED_OPS_DRAW(__prefix, __damage_area, cfb) -#define FB_GEN_DEFAULT_DEFERRED_SYS_OPS (__prefix, __damage_range, __damage_area) \ +#define FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS (__prefix, __damage_range, __damage_area) \ __FB_GEN_DEFAULT_DEFERRED_OPS_RDWR(__prefix, __damage_range, sys) \ __FB_GEN_DEFAULT_DEFERRED_OPS_DRAW(__prefix, __damage_area, sys)
Signature · 1 line
2.41.0
Hi Thomas,
Quoted 6 lines · Thomas Zimmermann
As discussed at [1], rename helpers for struct
fb_opsto include 'MEM' in their name to signal that these helpers operate on a certain type of memory address; either I/O, system or DMA-able ranges. These are trival renames without any functional changes.[1] https://lore.kernel.org/dri-devel/[email protected]/T/#mcb92691d6131333782cc83190a5fc00bd575a0c5
Yep, Helge is right that the naming is better with MEM added. Good that we could get this sorted out now where the impact is "only" in drm.
All 4 patches are: