* [PATCH 0/4] fbdev: Rename helpers for struct fb_ops
@ 2023-07-29 19:26 Thomas Zimmermann
2023-07-29 19:26 ` [PATCH 1/4] fbdev: Use _IOMEM_ infix for I/O-memory helpers Thomas Zimmermann
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Thomas Zimmermann @ 2023-07-29 19:26 UTC (permalink / raw)
To: deller, sam, javierm; +Cc: dri-devel, linux-fbdev, Thomas Zimmermann
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/1ab418ae-592f-4347-fa75-bf9b00115afe@gmx.de/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
--
2.41.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] fbdev: Use _IOMEM_ infix for I/O-memory helpers
2023-07-29 19:26 [PATCH 0/4] fbdev: Rename helpers for struct fb_ops Thomas Zimmermann
@ 2023-07-29 19:26 ` Thomas Zimmermann
2023-07-29 19:26 ` [PATCH 2/4] fbdev: Use _SYSMEM_ infix for system-memory helpers Thomas Zimmermann
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Thomas Zimmermann @ 2023-07-29 19:26 UTC (permalink / raw)
To: deller, sam, javierm; +Cc: dri-devel, linux-fbdev, Thomas Zimmermann
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.
Suggested-by: Helge Deller <deller@gmx.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
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(-)
diff --git a/drivers/gpu/drm/armada/Kconfig b/drivers/gpu/drm/armada/Kconfig
index 5afade25e217..e5597d7c9ae1 100644
--- a/drivers/gpu/drm/armada/Kconfig
+++ b/drivers/gpu/drm/armada/Kconfig
@@ -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
diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
index e40a95e51785..d223176912b6 100644
--- a/drivers/gpu/drm/armada/armada_fbdev.c
+++ b/drivers/gpu/drm/armada/armada_fbdev.c
@@ -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,
};
diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig
index cd3d92725ed4..efb4a2dd2f80 100644
--- a/drivers/gpu/drm/gma500/Kconfig
+++ b/drivers/gpu/drm/gma500/Kconfig
@@ -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
diff --git a/drivers/gpu/drm/gma500/fbdev.c b/drivers/gpu/drm/gma500/fbdev.c
index be8f5fbd5260..98b44974d42d 100644
--- a/drivers/gpu/drm/gma500/fbdev.c
+++ b/drivers/gpu/drm/gma500/fbdev.c
@@ -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,
};
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 01b5a8272a27..ce397a8797f7 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -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
diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig
index fe498c8af1bb..f98356be0af2 100644
--- a/drivers/gpu/drm/radeon/Kconfig
+++ b/drivers/gpu/drm/radeon/Kconfig
@@ -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
diff --git a/drivers/gpu/drm/radeon/radeon_fbdev.c b/drivers/gpu/drm/radeon/radeon_fbdev.c
index 68c06ac9acce..02bf25759059 100644
--- a/drivers/gpu/drm/radeon/radeon_fbdev.c
+++ b/drivers/gpu/drm/radeon/radeon_fbdev.c
@@ -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,
};
diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig
index 85434381b6c6..6d562f83dcc2 100644
--- a/drivers/video/fbdev/core/Kconfig
+++ b/drivers/video/fbdev/core/Kconfig
@@ -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
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 2ef7788311fc..bb5eb98cde83 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -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
--
2.41.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] fbdev: Use _SYSMEM_ infix for system-memory helpers
2023-07-29 19:26 [PATCH 0/4] fbdev: Rename helpers for struct fb_ops Thomas Zimmermann
2023-07-29 19:26 ` [PATCH 1/4] fbdev: Use _IOMEM_ infix for I/O-memory helpers Thomas Zimmermann
@ 2023-07-29 19:26 ` Thomas Zimmermann
2023-07-29 19:26 ` [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers Thomas Zimmermann
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Thomas Zimmermann @ 2023-07-29 19:26 UTC (permalink / raw)
To: deller, sam, javierm; +Cc: dri-devel, linux-fbdev, Thomas Zimmermann
Change 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.
Suggested-by: Helge Deller <deller@gmx.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
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(-)
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 0d499669d653..34da733e8606 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -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
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index a78662bd6273..6309a857ca31 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -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
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index c0b0419e98b6..5f8392b4f2a1 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -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.
diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig
index 6d562f83dcc2..28e771a46df6 100644
--- a/drivers/video/fbdev/core/Kconfig
+++ b/drivers/video/fbdev/core/Kconfig
@@ -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
diff --git a/include/linux/fb.h b/include/linux/fb.h
index bb5eb98cde83..76472482dc30 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -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
--
2.41.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers
2023-07-29 19:26 [PATCH 0/4] fbdev: Rename helpers for struct fb_ops Thomas Zimmermann
2023-07-29 19:26 ` [PATCH 1/4] fbdev: Use _IOMEM_ infix for I/O-memory helpers Thomas Zimmermann
2023-07-29 19:26 ` [PATCH 2/4] fbdev: Use _SYSMEM_ infix for system-memory helpers Thomas Zimmermann
@ 2023-07-29 19:26 ` Thomas Zimmermann
2023-07-30 16:20 ` Helge Deller
2023-07-29 19:26 ` [PATCH 4/4] fbdev: Align deferred I/O with naming of helpers Thomas Zimmermann
2023-07-30 8:53 ` [PATCH 0/4] fbdev: Rename helpers for struct fb_ops Sam Ravnborg
4 siblings, 1 reply; 9+ messages in thread
From: Thomas Zimmermann @ 2023-07-29 19:26 UTC (permalink / raw)
To: deller, sam, javierm; +Cc: dri-devel, linux-fbdev, Thomas Zimmermann
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(-)
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
--
2.41.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] fbdev: Align deferred I/O with naming of helpers
2023-07-29 19:26 [PATCH 0/4] fbdev: Rename helpers for struct fb_ops Thomas Zimmermann
` (2 preceding siblings ...)
2023-07-29 19:26 ` [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers Thomas Zimmermann
@ 2023-07-29 19:26 ` Thomas Zimmermann
2023-07-30 8:53 ` [PATCH 0/4] fbdev: Rename helpers for struct fb_ops Sam Ravnborg
4 siblings, 0 replies; 9+ messages in thread
From: Thomas Zimmermann @ 2023-07-29 19:26 UTC (permalink / raw)
To: deller, sam, javierm; +Cc: dri-devel, linux-fbdev, Thomas Zimmermann
Deferred-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.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
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(-)
diff --git a/drivers/gpu/drm/drm_fbdev_generic.c b/drivers/gpu/drm/drm_fbdev_generic.c
index a0ea042b1526..d647d89764cb 100644
--- a/drivers/gpu/drm/drm_fbdev_generic.c
+++ b/drivers/gpu/drm/drm_fbdev_generic.c
@@ -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)
{
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index e75852f13930..31d0d695d567 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -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)
{
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index bf1e17dc4550..030bedac632d 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -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)
{
diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c
index bace1f04fc8e..e857b15e9f5d 100644
--- a/drivers/video/fbdev/broadsheetfb.c
+++ b/drivers/video/fbdev/broadsheetfb.c
@@ -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,
diff --git a/drivers/video/fbdev/hecubafb.c b/drivers/video/fbdev/hecubafb.c
index c4938554ea45..ef526ed4a2d9 100644
--- a/drivers/video/fbdev/hecubafb.c
+++ b/drivers/video/fbdev/hecubafb.c
@@ -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,
diff --git a/drivers/video/fbdev/metronomefb.c b/drivers/video/fbdev/metronomefb.c
index eb15b9dbdec8..130394616a7c 100644
--- a/drivers/video/fbdev/metronomefb.c
+++ b/drivers/video/fbdev/metronomefb.c
@@ -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,
diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index a2b939342a4f..5aee62434443 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -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,
diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c
index 9a4c29cb1a80..66d4628a96ae 100644
--- a/drivers/video/fbdev/xen-fbfront.c
+++ b/drivers/video/fbdev/xen-fbfront.c
@@ -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,
diff --git a/include/linux/fb.h b/include/linux/fb.h
index d255263c2d1d..16c3e6d6c55d 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -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)
--
2.41.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/4] fbdev: Rename helpers for struct fb_ops
2023-07-29 19:26 [PATCH 0/4] fbdev: Rename helpers for struct fb_ops Thomas Zimmermann
` (3 preceding siblings ...)
2023-07-29 19:26 ` [PATCH 4/4] fbdev: Align deferred I/O with naming of helpers Thomas Zimmermann
@ 2023-07-30 8:53 ` Sam Ravnborg
4 siblings, 0 replies; 9+ messages in thread
From: Sam Ravnborg @ 2023-07-30 8:53 UTC (permalink / raw)
To: Thomas Zimmermann; +Cc: deller, javierm, dri-devel, linux-fbdev
Hi Thomas,
On Sat, Jul 29, 2023 at 09:26:45PM +0200, Thomas Zimmermann wrote:
> 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/1ab418ae-592f-4347-fa75-bf9b00115afe@gmx.de/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:
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers
2023-07-29 19:26 ` [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers Thomas Zimmermann
@ 2023-07-30 16:20 ` Helge Deller
2023-07-31 7:30 ` Thomas Zimmermann
0 siblings, 1 reply; 9+ messages in thread
From: Helge Deller @ 2023-07-30 16:20 UTC (permalink / raw)
To: Thomas Zimmermann, sam, javierm; +Cc: dri-devel, linux-fbdev
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers
2023-07-30 16:20 ` Helge Deller
@ 2023-07-31 7:30 ` Thomas Zimmermann
2023-07-31 7:53 ` Helge Deller
0 siblings, 1 reply; 9+ messages in thread
From: Thomas Zimmermann @ 2023-07-31 7:30 UTC (permalink / raw)
To: Helge Deller, sam, javierm; +Cc: dri-devel, linux-fbdev
[-- Attachment #1.1: Type: text/plain, Size: 8756 bytes --]
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
>
--
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)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers
2023-07-31 7:30 ` Thomas Zimmermann
@ 2023-07-31 7:53 ` Helge Deller
0 siblings, 0 replies; 9+ messages in thread
From: Helge Deller @ 2023-07-31 7:53 UTC (permalink / raw)
To: Thomas Zimmermann, sam, javierm; +Cc: dri-devel, linux-fbdev
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
>>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-07-31 7:53 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-29 19:26 [PATCH 0/4] fbdev: Rename helpers for struct fb_ops Thomas Zimmermann
2023-07-29 19:26 ` [PATCH 1/4] fbdev: Use _IOMEM_ infix for I/O-memory helpers Thomas Zimmermann
2023-07-29 19:26 ` [PATCH 2/4] fbdev: Use _SYSMEM_ infix for system-memory helpers Thomas Zimmermann
2023-07-29 19:26 ` [PATCH 3/4] fbdev: Use _DMAMEM_ infix for DMA-memory helpers Thomas Zimmermann
2023-07-30 16:20 ` Helge Deller
2023-07-31 7:30 ` Thomas Zimmermann
2023-07-31 7:53 ` Helge Deller
2023-07-29 19:26 ` [PATCH 4/4] fbdev: Align deferred I/O with naming of helpers Thomas Zimmermann
2023-07-30 8:53 ` [PATCH 0/4] fbdev: Rename helpers for struct fb_ops Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).