drm/fbdev: Remove DRM's helpers for fbdev I/O
Subsystems (15)
Thomas Zimmermann
maintainerv3 cover drm/fbdev: Remove DRM's helpers for fbdev I/O
DRM provides a number of wrappers around fbdev cfb_() sys_(), fb_io_() and fb_sys_() helpers. The DRM functions don't provide any additional functionality for most DRM drivers. So remove them and call the fbdev I/O helpers directly.
The DRM fbdev I/O wrappers were originally added because <linux/fb.h> does not protect its content with CONFIG_FB. DRM fbdev emulation did not build if the config option had been disabled. This has been fixed. For fbdev-generic and i915, the wrappers added support for damage handling. But this is better handled within the two callers, as each is special in its damage handling.
Patch 1 adds several internal Kconfig otpions that DRM drivers (and possibly other fbdev code) will use to select the correct set of I/O helpers.
Patches 2 to 9 replace the DRM wrappers in a number of fbdev emulations. Patch 10 exports two helpers for damage handling. Patches 11 and 12 update fbdev-generic and i915 with the help of the exported functions. The patches also remove DRM's fbdev I/O helpers, which are now unused.
DRM's fbdev helpers had to select fbdev I/O helpers for I/O and for system memory. Each fbdev emulation now selects the correct helpers for itself. Depending on the selected DRM drivers, kernel builds will now only contain the necessary fbdev I/O helpers and might be slightly smaller in size.
v3:
* fix Kconfig options (Jingfeng)
* minimize changes to exynos (Sam)
v2:
* simplify Kconfig handling (Sam)
Thomas Zimmermann (12):
fbdev: Add Kconfig options to select different fb_ops helpers drm/armada: Use regular fbdev I/O helpers drm/exynos: Use regular fbdev I/O helpers drm/gma500: Use regular fbdev I/O helpers drm/radeon: Use regular fbdev I/O helpers drm/fbdev-dma: Use regular fbdev I/O helpers drm/msm: Use regular fbdev I/O helpers
drm/omapdrm: Use regular fbdev I/O helpers drm/tegra: Use regular fbdev I/O helpers drm/fb-helper: Export helpers for marking damage areas drm/fbdev-generic: Implement dedicated fbdev I/O helpers drm/i915: Implement dedicated fbdev I/O helpers
drivers/gpu/drm/Kconfig | 10 +- drivers/gpu/drm/armada/Kconfig | 1 + drivers/gpu/drm/armada/armada_fbdev.c | 9 +- drivers/gpu/drm/drm_fb_helper.c | 233 ++------------------- drivers/gpu/drm/drm_fbdev_dma.c | 12 +- drivers/gpu/drm/drm_fbdev_generic.c | 47 ++++- drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 10 +- drivers/gpu/drm/gma500/Kconfig | 1 + drivers/gpu/drm/gma500/fbdev.c | 9 +- drivers/gpu/drm/i915/Kconfig | 1 + drivers/gpu/drm/i915/display/intel_fbdev.c | 51 ++++- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/msm_fbdev.c | 12 +- drivers/gpu/drm/omapdrm/Kconfig | 1 + drivers/gpu/drm/omapdrm/omap_fbdev.c | 12 +- drivers/gpu/drm/radeon/Kconfig | 1 + drivers/gpu/drm/radeon/radeon_fbdev.c | 9 +- drivers/gpu/drm/tegra/Kconfig | 1 + drivers/gpu/drm/tegra/fbdev.c | 11 +- drivers/video/fbdev/Kconfig | 21 ++ include/drm/drm_fb_helper.h | 84 +------- 22 files changed, 183 insertions(+), 355 deletions(-)
base-commit: f533234d40e8f5b8599bd5bc97fa8e30384aec03
prerequisite-patch-id: 0aa359f6144c4015c140c8a6750be19099c676fb
prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24
prerequisite-patch-id: cbc453ee02fae02af22fbfdce56ab732c7a88c36
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 1/12 fbdev: Add Kconfig options to select different fb_ops helpers
Many fbdev drivers use the same set of fb_ops helpers. Add Kconfig options to select them at once. This will help with making DRM's fbdev emulation code more modular, but can also be used to simplify fbdev's driver configs.
v3:
* fix select statement (Jingfeng)
--- drivers/video/fbdev/Kconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/video/fbdev/Kconfig +21 -0
@@ -158,6 +158,27 @@ config FB_DEFERRED_IO bool depends on FB +config FB_IO_HELPERS + bool + depends on FB + select FB_CFB_COPYAREA + select FB_CFB_FILLRECT + select FB_CFB_IMAGEBLIT + +config FB_SYS_HELPERS + bool + depends on FB + select FB_SYS_COPYAREA + select FB_SYS_FILLRECT + select FB_SYS_FOPS + select FB_SYS_IMAGEBLIT + +config FB_SYS_HELPERS_DEFERRED + bool + depends on FB + select FB_DEFERRED_IO + select FB_SYS_HELPERS + config FB_HECUBA tristate depends on FB
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 2/12 drm/armada: Use regular fbdev I/O helpers
In reply to Thomas ZimmermannUse the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Armada does not use damage handling, so DRM's fbdev helpers are mere wrappers around the fbdev code.
By using fbdev helpers directly within each DRM fbdev emulation, we can eventually remove DRM's wrapper functions entirely.
v2:
* use FB_IO_HELPERS option
--- drivers/gpu/drm/armada/Kconfig | 1 + drivers/gpu/drm/armada/armada_fbdev.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/armada/Kconfig +1 -0
@@ -3,6 +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 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 +4 -5
@@ -5,6 +5,7 @@*/ #include <linux/errno.h> +#include <linux/fb.h> #include <linux/kernel.h> #include <linux/module.h>
@@ -34,11 +35,9 @@ static void armada_fbdev_fb_destroy(struct fb_info *info)static const struct fb_ops armada_fb_ops = { .owner =THIS_MODULE ,DRM_FB_HELPER_DEFAULT_OPS , - .fb_read = drm_fb_helper_cfb_read, - .fb_write = drm_fb_helper_cfb_write, - .fb_fillrect = drm_fb_helper_cfb_fillrect, - .fb_copyarea = drm_fb_helper_cfb_copyarea, - .fb_imageblit = drm_fb_helper_cfb_imageblit, + .fb_fillrect = cfb_fillrect, + .fb_copyarea = cfb_copyarea, + .fb_imageblit = cfb_imageblit, .fb_destroy = armada_fbdev_fb_destroy, };
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 3/12 drm/exynos: Use regular fbdev I/O helpers
In reply to Thomas ZimmermannUse the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Exynos does not use damage handling, so DRM's fbdev helpers are mere wrappers around the fbdev code.
By using fbdev helpers directly within each DRM fbdev emulation, we can eventually remove DRM's wrapper functions entirely.
v3:
* don't reorder Makefile rules (Sam)
v2:
* use FB_IO_HELPERS option
--- drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/exynos/Kconfig +1 -0
@@ -7,6 +7,7 @@ config DRM_EXYNOS select DRM_DISPLAY_HELPER if DRM_EXYNOS_DP select DRM_KMS_HELPER select VIDEOMODE_HELPERS + select FB_IO_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 +5 -5
@@ -8,6 +8,8 @@* Seung-Woo Kim <[email protected]> */ +#include <linux/fb.h> +#include <drm/drm_crtc_helper.h> #include <drm/drm_drv.h> #include <drm/drm_fb_helper.h>
@@ -49,11 +51,9 @@ static const struct fb_ops exynos_drm_fb_ops = { .owner = THIS_MODULE,DRM_FB_HELPER_DEFAULT_OPS , .fb_mmap = exynos_drm_fb_mmap, - .fb_read = drm_fb_helper_cfb_read, - .fb_write = drm_fb_helper_cfb_write, - .fb_fillrect = drm_fb_helper_cfb_fillrect, - .fb_copyarea = drm_fb_helper_cfb_copyarea, - .fb_imageblit = drm_fb_helper_cfb_imageblit, + .fb_fillrect = cfb_fillrect, + .fb_copyarea = cfb_copyarea, + .fb_imageblit = cfb_imageblit, .fb_destroy = exynos_drm_fb_destroy, };
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 4/12 drm/gma500: Use regular fbdev I/O helpers
In reply to Thomas ZimmermannUse the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Gma500 does not use damage handling, so DRM's fbdev helpers are mere wrappers around the fbdev code.
By using fbdev helpers directly within each DRM fbdev emulation, we can eventually remove DRM's wrapper functions entirely.
v2:
* use FB_IO_HELPERS option
--- drivers/gpu/drm/gma500/Kconfig | 1 + drivers/gpu/drm/gma500/fbdev.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/gma500/Kconfig +1 -0
@@ -3,6 +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 I2C select I2C_ALGOBIT # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915
drivers/gpu/drm/gma500/fbdev.c +4 -5
@@ -5,6 +5,7 @@* **************************************************************************/ +#include <linux/fb.h> #include <linux/pfn_t.h> #include <drm/drm_crtc_helper.h>
@@ -136,11 +137,9 @@ static const struct fb_ops psb_fbdev_fb_ops = { .owner = THIS_MODULE,DRM_FB_HELPER_DEFAULT_OPS , .fb_setcolreg = psb_fbdev_fb_setcolreg, - .fb_read = drm_fb_helper_cfb_read, - .fb_write = drm_fb_helper_cfb_write, - .fb_fillrect = drm_fb_helper_cfb_fillrect, - .fb_copyarea = drm_fb_helper_cfb_copyarea, - .fb_imageblit = drm_fb_helper_cfb_imageblit, + .fb_fillrect = cfb_fillrect, + .fb_copyarea = cfb_copyarea, + .fb_imageblit = cfb_imageblit, .fb_mmap = psb_fbdev_fb_mmap, .fb_destroy = psb_fbdev_fb_destroy, };
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 5/12 drm/radeon: Use regular fbdev I/O helpers
In reply to Thomas ZimmermannUse the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Radeon does not use damage handling, so DRM's fbdev helpers are mere wrappers around the fbdev code.
By using fbdev helpers directly within each DRM fbdev emulation, we can eventually remove DRM's wrapper functions entirely.
v2:
* use FB_IO_HELPERS option
--- drivers/gpu/drm/radeon/Kconfig | 1 + drivers/gpu/drm/radeon/radeon_fbdev.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/radeon/Kconfig +1 -0
@@ -11,6 +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 SND_HDA_COMPONENT if SND_HDA_CORE select POWER_SUPPLY select HWMON
drivers/gpu/drm/radeon/radeon_fbdev.c +4 -5
@@ -24,6 +24,7 @@* David Airlie */ +#include <linux/fb.h> #include <linux/pci.h> #include <linux/pm_runtime.h> #include <linux/vga_switcheroo.h>
@@ -193,11 +194,9 @@ static const struct fb_ops radeon_fbdev_fb_ops = { DRM_FB_HELPER_DEFAULT_OPS, .fb_open = radeon_fbdev_fb_open, .fb_release = radeon_fbdev_fb_release, - .fb_read = drm_fb_helper_cfb_read, - .fb_write = drm_fb_helper_cfb_write, - .fb_fillrect = drm_fb_helper_cfb_fillrect, - .fb_copyarea = drm_fb_helper_cfb_copyarea, - .fb_imageblit = drm_fb_helper_cfb_imageblit, + .fb_fillrect = cfb_fillrect, + .fb_copyarea = cfb_copyarea, + .fb_imageblit = cfb_imageblit, .fb_destroy = radeon_fbdev_fb_destroy, };
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 6/12 drm/fbdev-dma: Use regular fbdev I/O helpers
In reply to Thomas ZimmermannUse the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Fbdev-dma does not use damage handling, so DRM's fbdev helpers are mere wrappers around the fbdev code.
By using fbdev helpers directly within each DRM fbdev emulation, we can eventually remove DRM's wrapper functions entirely.
v2:
* use FB_SYS_HELPERS option
--- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/drm_fbdev_dma.c | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-)
drivers/gpu/drm/Kconfig +1 -0
@@ -223,6 +223,7 @@ config DRM_TTM_HELPER config DRM_GEM_DMA_HELPER tristate depends on DRM + select FB_SYS_HELPERS if DRM_FBDEV_EMULATION help Choose this if you need the GEM DMA helper functions
drivers/gpu/drm/drm_fbdev_dma.c +7 -5
@@ -1,5 +1,7 @@// SPDX-License-Identifier: MIT +#include <linux/fb.h> +#include <drm/drm_crtc_helper.h> #include <drm/drm_drv.h> #include <drm/drm_fb_helper.h>
@@ -64,12 +66,12 @@ 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_read = drm_fb_helper_sys_read, - .fb_write = drm_fb_helper_sys_write, + .fb_read = fb_sys_read, + .fb_write = fb_sys_write,DRM_FB_HELPER_DEFAULT_OPS , - .fb_fillrect = drm_fb_helper_sys_fillrect, - .fb_copyarea = drm_fb_helper_sys_copyarea, - .fb_imageblit = drm_fb_helper_sys_imageblit, + .fb_fillrect = sys_fillrect, + .fb_copyarea = sys_copyarea, + .fb_imageblit = sys_imageblit, .fb_destroy = drm_fbdev_dma_fb_destroy, .fb_mmap = drm_fbdev_dma_fb_mmap, };
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 7/12 drm/msm: Use regular fbdev I/O helpers
In reply to Thomas ZimmermannUse the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Msm does not use damage handling, so DRM's fbdev helpers are mere wrappers around the fbdev code.
By using fbdev helpers directly within each DRM fbdev emulation, we can eventually remove DRM's wrapper functions entirely.
v2:
* use FB_SYS_HELPERS option
--- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/msm_fbdev.c | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/Kconfig +1 -0
@@ -21,6 +21,7 @@ config DRM_MSM select DRM_BRIDGE select DRM_PANEL_BRIDGE select DRM_SCHED + select FB_SYS_HELPERS if DRM_FBDEV_EMULATION select SHMEM select TMPFS select QCOM_SCM
drivers/gpu/drm/msm/msm_fbdev.c +7 -5
@@ -4,6 +4,8 @@* Author: Rob Clark <[email protected]> */ +#include <linux/fb.h> +#include <drm/drm_drv.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h>
@@ -57,11 +59,11 @@ static const struct fb_ops msm_fb_ops = {/* Note: to properly handle manual update displays, we wrap the * basic fbdev ops which write to the framebuffer */ - .fb_read = drm_fb_helper_sys_read, - .fb_write = drm_fb_helper_sys_write, - .fb_fillrect = drm_fb_helper_sys_fillrect, - .fb_copyarea = drm_fb_helper_sys_copyarea, - .fb_imageblit = drm_fb_helper_sys_imageblit, + .fb_read = fb_sys_read, + .fb_write = fb_sys_write, + .fb_fillrect = sys_fillrect, + .fb_copyarea = sys_copyarea, + .fb_imageblit = sys_imageblit, .fb_mmap = msm_fbdev_mmap, .fb_destroy = msm_fbdev_fb_destroy, };
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 8/12 drm/omapdrm: Use regular fbdev I/O helpers
In reply to Thomas ZimmermannUse the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Omapdrm does not use damage handling, so DRM's fbdev helpers are mere wrappers around the fbdev code.
By using fbdev helpers directly within each DRM fbdev emulation, we can eventually remove DRM's wrapper functions entirely.
v2:
* use FB_SYS_HELPERS option
--- drivers/gpu/drm/omapdrm/Kconfig | 1 + drivers/gpu/drm/omapdrm/omap_fbdev.c | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-)
drivers/gpu/drm/omapdrm/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_OMAP depends on DRM && OF depends on ARCH_OMAP2PLUS select DRM_KMS_HELPER + select FB_SYS_HELPERS if DRM_FBDEV_EMULATION select VIDEOMODE_HELPERS select HDMI default n
drivers/gpu/drm/omapdrm/omap_fbdev.c +7 -5
@@ -4,6 +4,8 @@* Author: Rob Clark <[email protected]> */ +#include <linux/fb.h> +#include <drm/drm_drv.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h>
@@ -103,11 +105,11 @@ static const struct fb_ops omap_fb_ops = { .fb_pan_display = omap_fbdev_pan_display, .fb_ioctl = drm_fb_helper_ioctl, - .fb_read = drm_fb_helper_sys_read, - .fb_write = drm_fb_helper_sys_write, - .fb_fillrect = drm_fb_helper_sys_fillrect, - .fb_copyarea = drm_fb_helper_sys_copyarea, - .fb_imageblit = drm_fb_helper_sys_imageblit, + .fb_read = fb_sys_read, + .fb_write = fb_sys_write, + .fb_fillrect = sys_fillrect, + .fb_copyarea = sys_copyarea, + .fb_imageblit = sys_imageblit, .fb_destroy = omap_fbdev_fb_destroy, };
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 9/12 drm/tegra: Use regular fbdev I/O helpers
In reply to Thomas ZimmermannUse the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Tegra does not use damage handling, so DRM's fbdev helpers are mere wrappers around the fbdev code.
By using fbdev helpers directly within each DRM fbdev emulation, we can eventually remove DRM's wrapper functions entirely.
v2:
* use FB_SYS_HELPERS option
--- drivers/gpu/drm/tegra/Kconfig | 1 + drivers/gpu/drm/tegra/fbdev.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/tegra/Kconfig +1 -0
@@ -12,6 +12,7 @@ config DRM_TEGRA select DRM_KMS_HELPER select DRM_MIPI_DSI select DRM_PANEL + select FB_SYS_HELPERS if DRM_FBDEV_EMULATION select TEGRA_HOST1X select INTERCONNECT select IOMMU_IOVA
drivers/gpu/drm/tegra/fbdev.c +6 -5
@@ -8,6 +8,7 @@*/ #include <linux/console.h> +#include <linux/fb.h> #include <linux/vmalloc.h> #include <drm/drm_drv.h>
@@ -59,11 +60,11 @@ static void tegra_fbdev_fb_destroy(struct fb_info *info)static const struct fb_ops tegra_fb_ops = { .owner =THIS_MODULE ,DRM_FB_HELPER_DEFAULT_OPS , - .fb_read = drm_fb_helper_sys_read, - .fb_write = drm_fb_helper_sys_write, - .fb_fillrect = drm_fb_helper_sys_fillrect, - .fb_copyarea = drm_fb_helper_sys_copyarea, - .fb_imageblit = drm_fb_helper_sys_imageblit, + .fb_read = fb_sys_read, + .fb_write = fb_sys_write, + .fb_fillrect = sys_fillrect, + .fb_copyarea = sys_copyarea, + .fb_imageblit = sys_imageblit, .fb_mmap = tegra_fb_mmap, .fb_destroy = tegra_fbdev_fb_destroy, };
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 10/12 drm/fb-helper: Export helpers for marking damage areas
In reply to Thomas ZimmermannExport drm_fb_helper_damage() and drm_fb_helper_damage_range(), which handle damage areas for fbdev emulation. This is a temporary export that allows to move the DRM I/O helpers for fbdev into drivers. Only fbdev-generic and i915 need them. Both will be updated to implement damage handling by themselves and the exported functions will be removed.
--- drivers/gpu/drm/drm_fb_helper.c | 19 +++++++++++++++++-- include/drm/drm_fb_helper.h | 4 ++++ 2 files changed, 21 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_fb_helper.c +17 -2
@@ -625,13 +625,15 @@ static void drm_fb_helper_add_damage_clip(struct drm_fb_helper *helper, u32 x, uspin_unlock_irqrestore (&helper->damage_lock, flags); } -static void drm_fb_helper_damage (struct drm_fb_helper *helper,u32 x,u32 y, -u32 width,u32 height) +/* Don't use in new code. */ +void drm_fb_helper_damage (struct drm_fb_helper *helper,u32 x,u32 y, +u32 width,u32 height) {drm_fb_helper_add_damage_clip (helper, x, y, width, height);schedule_work (&helper->damage_work); } +EXPORT_SYMBOL (drm_fb_helper_damage);/* * Convert memory region into area of scanlines and pixels per
@@ -670,6 +672,19 @@ static void drm_fb_helper_memory_range_to_clip(struct fb_info *info, off_t off,drm_rect_init (clip, x1, y1, x2 - x1, y2 - y1); } +/* Don't use in new code. */ +void drm_fb_helper_damage_range (struct drm_fb_helper *fb_helper,off_t off,size_t len) +{ +struct fb_info *info = fb_helper->info; +struct drm_rect damage_area; + +drm_fb_helper_memory_range_to_clip (info, off, len, &damage_area); +drm_fb_helper_damage (fb_helper, damage_area.x1, damage_area.y1, +drm_rect_width (&damage_area), +drm_rect_height (&damage_area)); +} +EXPORT_SYMBOL (drm_fb_helper_damage_range); +/** * drm_fb_helper_deferred_io() - fbdev deferred_io callback function * @info: fb_info struct pointer
include/drm/drm_fb_helper.h +4 -0
@@ -253,6 +253,10 @@ void drm_fb_helper_fill_info(struct fb_info *info,struct drm_fb_helper *fb_helper, struct drm_fb_helper_surface_size *sizes); +void drm_fb_helper_damage (struct drm_fb_helper *helper,u32 x,u32 y, +u32 width,u32 height); +void drm_fb_helper_damage_range (struct drm_fb_helper *helper,off_t off,size_t len); +void drm_fb_helper_deferred_io (struct fb_info *info,struct list_head *pagereflist); ssize_t drm_fb_helper_sys_read(struct fb_info *info, char __user *buf,
Signature · 1 line
2.40.1
Thomas Zimmermann
maintainerPATCH v3 11/12 drm/fbdev-generic: Implement dedicated fbdev I/O helpers
In reply to Thomas ZimmermannImplement dedicated fbdev helpers for framebuffer I/O instead of using DRM's helpers. Fbdev-generic was the only caller of the DRM helpers, so remove them from the helper module.
v2:
* use FB_SYS_HELPERS_DEFERRED option
--- drivers/gpu/drm/Kconfig | 6 +- drivers/gpu/drm/drm_fb_helper.c | 107 ---------------------------- drivers/gpu/drm/drm_fbdev_generic.c | 47 ++++++++++-- include/drm/drm_fb_helper.h | 41 ----------- 4 files changed, 43 insertions(+), 158 deletions(-)
drivers/gpu/drm/Kconfig +1 -5
@@ -95,6 +95,7 @@ config DRM_KUNIT_TEST config DRM_KMS_HELPER tristate depends on DRM + select FB_SYS_HELPERS_DEFERRED if DRM_FBDEV_EMULATION help CRTC helpers for KMS drivers.
@@ -135,11 +136,6 @@ config DRM_FBDEV_EMULATION select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_DEFERRED_IO - select FB_SYS_FOPS - select FB_SYS_FILLRECT - select FB_SYS_COPYAREA - select FB_SYS_IMAGEBLIT select FRAMEBUFFER_CONSOLE if !EXPERT select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE default y
drivers/gpu/drm/drm_fb_helper.c +0 -107
113 lines not on this page · raw message
drivers/gpu/drm/drm_fbdev_generic.c +42 -5
60 lines not on this page · raw message
include/drm/drm_fb_helper.h +0 -41
53 lines not on this page · raw message
Signature · 1 line
2.40.1
Re: [Freedreno] [PATCH v3 11/12] drm/fbdev-generic: Implement dedicated fbdev I/O helpers
Quoted 8 lines · Thomas Zimmermann
Implement dedicated fbdev helpers for framebuffer I/O instead of using DRM's helpers. Fbdev-generic was the only caller of the DRM helpers, so remove them from the helper module.
v2:
* useFB_SYS_HELPERS_DEFERREDoption
Quoted 7 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/Kconfig | 6 +- drivers/gpu/drm/drm_fb_helper.c | 107 ---------------------------- drivers/gpu/drm/drm_fbdev_generic.c | 47 ++++++++++-- include/drm/drm_fb_helper.h | 41 ----------- 4 files changed, 43 insertions(+), 158 deletions(-)
Looking at this patch makes me wonder if we should have implemented fb_dirty for the MSM driver. We have drm_framebuffer_funcs::dirty() implemented (by wrapping the drm_atomic_helper_dirtyfb()).
Quoted 271 lines
drivers/gpu/drm/Kconfig +1
-5@@ -95,6 +95,7 @@ config DRM_KUNIT_TEST config DRM_KMS_HELPER tristate depends on DRM + select FB_SYS_HELPERS_DEFERRED if DRM_FBDEV_EMULATION help CRTC helpers for KMS drivers.@@ -135,11 +136,6 @@ config DRM_FBDEV_EMULATION select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_DEFERRED_IO - select FB_SYS_FOPS - select FB_SYS_FILLRECT - select FB_SYS_COPYAREA - select FB_SYS_IMAGEBLIT select FRAMEBUFFER_CONSOLE if !EXPERT select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE default ydrivers/gpu/drm/drm_fb_helper.c +0
-107@@ -729,113 +729,6 @@ void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagerefli }EXPORT_SYMBOL (drm_fb_helper_deferred_io); -/** -* drm_fb_helper_sys_read - Implements struct &fb_ops.fb_read for system memory -* @info: fb_info struct pointer -* @buf: userspace buffer to read from framebuffer memory -* @count: number of bytes to read from framebuffer memory -* @ppos: read offset within framebuffer memory -* -* Returns: -* The number of bytes read on success, or an error code otherwise. -*/ -ssize_t drm_fb_helper_sys_read (struct fb_info *info,char __user *buf, -size_t count,loff_t *ppos) -{ -return fb_sys_read (info, buf, count, ppos); -} -EXPORT_SYMBOL (drm_fb_helper_sys_read); - -/** -* drm_fb_helper_sys_write - Implements struct &fb_ops.fb_write for system memory -* @info: fb_info struct pointer -* @buf: userspace buffer to write to framebuffer memory -* @count: number of bytes to write to framebuffer memory -* @ppos: write offset within framebuffer memory -* -* Returns: -* The number of bytes written on success, or an error code otherwise. -*/ -ssize_t drm_fb_helper_sys_write (struct fb_info *info,const char __user *buf, -size_t count,loff_t *ppos) -{ -struct drm_fb_helper *helper = info->par; -loff_t pos = *ppos; -ssize_t ret; -struct drm_rect damage_area; - - ret =fb_sys_write (info, buf, count, ppos); -if (ret <=0 ) -return ret; - -if (helper->funcs->fb_dirty) { -drm_fb_helper_memory_range_to_clip (info, pos, ret, &damage_area); -drm_fb_helper_damage (helper, damage_area.x1, damage_area.y1, -drm_rect_width (&damage_area), -drm_rect_height (&damage_area)); - } - -return ret; -} -EXPORT_SYMBOL (drm_fb_helper_sys_write); - -/** -* drm_fb_helper_sys_fillrect - wrapper around sys_fillrect -* @info: fbdev registered by the helper -* @rect: info about rectangle to fill -* -* A wrapper around sys_fillrect implemented by fbdev core -*/ -void drm_fb_helper_sys_fillrect (struct fb_info *info, -const struct fb_fillrect *rect) -{ -struct drm_fb_helper *helper = info->par; - -sys_fillrect (info, rect); - -if (helper->funcs->fb_dirty) -drm_fb_helper_damage (helper, rect->dx, rect->dy, rect->width, rect->height); -} -EXPORT_SYMBOL (drm_fb_helper_sys_fillrect); - -/** -* drm_fb_helper_sys_copyarea - wrapper around sys_copyarea -* @info: fbdev registered by the helper -* @area: info about area to copy -* -* A wrapper around sys_copyarea implemented by fbdev core -*/ -void drm_fb_helper_sys_copyarea (struct fb_info *info, -const struct fb_copyarea *area) -{ -struct drm_fb_helper *helper = info->par; - -sys_copyarea (info, area); - -if (helper->funcs->fb_dirty) -drm_fb_helper_damage (helper, area->dx, area->dy, area->width, area->height); -} -EXPORT_SYMBOL (drm_fb_helper_sys_copyarea); - -/** -* drm_fb_helper_sys_imageblit - wrapper around sys_imageblit -* @info: fbdev registered by the helper -* @image: info about image to blit -* -* A wrapper around sys_imageblit implemented by fbdev core -*/ -void drm_fb_helper_sys_imageblit (struct fb_info *info, -const struct fb_image *image) -{ -struct drm_fb_helper *helper = info->par; - -sys_imageblit (info, image); - -if (helper->funcs->fb_dirty) -drm_fb_helper_damage (helper, image->dx, image->dy, image->width, image->height); -} -EXPORT_SYMBOL (drm_fb_helper_sys_imageblit); -/** * drm_fb_helper_cfb_read - Implements struct &fb_ops.fb_read for I/O memory * @info: fb_info struct pointer drivers/gpu/drm/drm_fbdev_generic.c +42
-5@@ -34,6 +34,43 @@ static int drm_fbdev_generic_fb_release(struct fb_info *info, int user)return 0 ; } +static ssize_t drm_fbdev_generic_fb_write (struct fb_info *info,const char __user *buf, +size_t count,loff_t *ppos) +{ +struct drm_fb_helper *helper = info->par; +loff_t pos = *ppos; +ssize_t ret; + + ret =fb_sys_write (info, buf, count, ppos); +if (ret >0 ) +drm_fb_helper_damage_range (helper, pos, ret); +return ret; +} + +static void drm_fbdev_generic_fb_fillrect (struct fb_info *info,const struct fb_fillrect *rect) +{ +struct drm_fb_helper *helper = info->par; + +sys_fillrect (info, rect); +drm_fb_helper_damage (helper, rect->dx, rect->dy, rect->width, rect->height); +} + +static void drm_fbdev_generic_fb_copyarea (struct fb_info *info,const struct fb_copyarea *area) +{ +struct drm_fb_helper *helper = info->par; + +sys_copyarea (info, area); +drm_fb_helper_damage (helper, area->dx, area->dy, area->width, area->height); +} + +static void drm_fbdev_generic_fb_imageblit (struct fb_info *info,const struct fb_image *image) +{ +struct drm_fb_helper *helper = info->par; + +sys_imageblit (info, image); +drm_fb_helper_damage (helper, image->dx, image->dy, image->width, image->height); +} +static void drm_fbdev_generic_fb_destroy (struct fb_info *info) {struct drm_fb_helper *fb_helper = info->par;@@ -56,12 +93,12 @@ static const struct fb_ops drm_fbdev_generic_fb_ops = { .owner = THIS_MODULE, .fb_open = drm_fbdev_generic_fb_open, .fb_release = drm_fbdev_generic_fb_release, - .fb_read = drm_fb_helper_sys_read, - .fb_write = drm_fb_helper_sys_write, + .fb_read = fb_sys_read, + .fb_write = drm_fbdev_generic_fb_write,DRM_FB_HELPER_DEFAULT_OPS , - .fb_fillrect = drm_fb_helper_sys_fillrect, - .fb_copyarea = drm_fb_helper_sys_copyarea, - .fb_imageblit = drm_fb_helper_sys_imageblit, + .fb_fillrect = drm_fbdev_generic_fb_fillrect, + .fb_copyarea = drm_fbdev_generic_fb_copyarea, + .fb_imageblit = drm_fbdev_generic_fb_imageblit, .fb_mmap = fb_deferred_io_mmap, .fb_destroy = drm_fbdev_generic_fb_destroy, };include/drm/drm_fb_helper.h +0
-42@@ -259,18 +259,6 @@ void drm_fb_helper_damage_range(struct drm_fb_helper *helper, off_t off, size_tvoid drm_fb_helper_deferred_io (struct fb_info *info,struct list_head *pagereflist); -ssize_t drm_fb_helper_sys_read (struct fb_info *info,char __user *buf, -size_t count,loff_t *ppos); -ssize_t drm_fb_helper_sys_write (struct fb_info *info,const char __user *buf, -size_t count,loff_t *ppos); - -void drm_fb_helper_sys_fillrect (struct fb_info *info, -const struct fb_fillrect *rect); -void drm_fb_helper_sys_copyarea (struct fb_info *info, -const struct fb_copyarea *area); -void drm_fb_helper_sys_imageblit (struct fb_info *info, -const struct fb_image *image); -ssize_t drm_fb_helper_cfb_read (struct fb_info *info,char __user *buf,size_t count,loff_t *ppos); ssize_t drm_fb_helper_cfb_write(struct fb_info *info, const char __user *buf,@@ -398,35 +386,6 @@ static inline int drm_fb_helper_defio_init(struct drm_fb_helper *fb_helper)return -ENODEV ; } -static inline ssize_t drm_fb_helper_sys_read (struct fb_info *info, -char __user *buf,size_t count, -loff_t *ppos) -{ -return -ENODEV ; -} - -static inline ssize_t drm_fb_helper_sys_write (struct fb_info *info, -const char __user *buf, -size_t count,loff_t *ppos) -{ -return -ENODEV ; -} - -static inline void drm_fb_helper_sys_fillrect (struct fb_info *info, -const struct fb_fillrect *rect) -{ -} - -static inline void drm_fb_helper_sys_copyarea (struct fb_info *info, -const struct fb_copyarea *area) -{ -} - -static inline void drm_fb_helper_sys_imageblit (struct fb_info *info, -const struct fb_image *image) -{ -} -static inline ssize_t drm_fb_helper_cfb_read (struct fb_info *info,char __user *buf,size_t count,loff_t *ppos) { --2.40.1
Signature · 2 lines
With best wishes Dmitry
Thomas Zimmermann
maintainerRe: [Freedreno] [PATCH v3 11/12] drm/fbdev-generic: Implement dedicated fbdev I/O helpers
Hi
Am 22.05.23 um 15:20 schrieb Dmitry Baryshkov:
Quoted 17 lines · Thomas Zimmermann
Quoted 8 lines
Implement dedicated fbdev helpers for framebuffer I/O instead of using DRM's helpers. Fbdev-generic was the only caller of the DRM helpers, so remove them from the helper module.
v2:
* useFB_SYS_HELPERS_DEFERREDoptionQuoted 7 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/Kconfig | 6 +- drivers/gpu/drm/drm_fb_helper.c | 107 ---------------------------- drivers/gpu/drm/drm_fbdev_generic.c | 47 ++++++++++-- include/drm/drm_fb_helper.h | 41 ----------- 4 files changed, 43 insertions(+), 158 deletions(-)
Quoted 3 lines
Looking at this patch makes me wonder if we should have implemented
fb_dirtyfor the MSM driver. We havedrm_framebuffer_funcs::dirty()implemented (by wrapping thedrm_atomic_helper_dirtyfb()).
I think so. You'd need something similar to the generic fbdev emulation. But it's for a separate patchset. Apparently no one has complained so far.
Best regards
Thomas
Quoted 274 lines
Quoted 272 lines
drivers/gpu/drm/Kconfig +1
-5@@ -95,6 +95,7 @@ config DRM_KUNIT_TEST config DRM_KMS_HELPER tristate depends on DRM + select FB_SYS_HELPERS_DEFERRED if DRM_FBDEV_EMULATION help CRTC helpers for KMS drivers.@@ -135,11 +136,6 @@ config DRM_FBDEV_EMULATION select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select FB_DEFERRED_IO - select FB_SYS_FOPS - select FB_SYS_FILLRECT - select FB_SYS_COPYAREA - select FB_SYS_IMAGEBLIT select FRAMEBUFFER_CONSOLE if !EXPERT select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE default ydrivers/gpu/drm/drm_fb_helper.c +0
-107@@ -729,113 +729,6 @@ void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagerefli }EXPORT_SYMBOL (drm_fb_helper_deferred_io); -/** -* drm_fb_helper_sys_read - Implements struct &fb_ops.fb_read for system memory -* @info: fb_info struct pointer -* @buf: userspace buffer to read from framebuffer memory -* @count: number of bytes to read from framebuffer memory -* @ppos: read offset within framebuffer memory -* -* Returns: -* The number of bytes read on success, or an error code otherwise. -*/ -ssize_t drm_fb_helper_sys_read (struct fb_info *info,char __user *buf, -size_t count,loff_t *ppos) -{ -return fb_sys_read (info, buf, count, ppos); -} -EXPORT_SYMBOL (drm_fb_helper_sys_read); - -/** -* drm_fb_helper_sys_write - Implements struct &fb_ops.fb_write for system memory -* @info: fb_info struct pointer -* @buf: userspace buffer to write to framebuffer memory -* @count: number of bytes to write to framebuffer memory -* @ppos: write offset within framebuffer memory -* -* Returns: -* The number of bytes written on success, or an error code otherwise. -*/ -ssize_t drm_fb_helper_sys_write (struct fb_info *info,const char __user *buf, -size_t count,loff_t *ppos) -{ -struct drm_fb_helper *helper = info->par; -loff_t pos = *ppos; -ssize_t ret; -struct drm_rect damage_area; - - ret =fb_sys_write (info, buf, count, ppos); -if (ret <=0 ) -return ret; - -if (helper->funcs->fb_dirty) { -drm_fb_helper_memory_range_to_clip (info, pos, ret, &damage_area); -drm_fb_helper_damage (helper, damage_area.x1, damage_area.y1, -drm_rect_width (&damage_area), -drm_rect_height (&damage_area)); - } - -return ret; -} -EXPORT_SYMBOL (drm_fb_helper_sys_write); - -/** -* drm_fb_helper_sys_fillrect - wrapper around sys_fillrect -* @info: fbdev registered by the helper -* @rect: info about rectangle to fill -* -* A wrapper around sys_fillrect implemented by fbdev core -*/ -void drm_fb_helper_sys_fillrect (struct fb_info *info, -const struct fb_fillrect *rect) -{ -struct drm_fb_helper *helper = info->par; - -sys_fillrect (info, rect); - -if (helper->funcs->fb_dirty) -drm_fb_helper_damage (helper, rect->dx, rect->dy, rect->width, rect->height); -} -EXPORT_SYMBOL (drm_fb_helper_sys_fillrect); - -/** -* drm_fb_helper_sys_copyarea - wrapper around sys_copyarea -* @info: fbdev registered by the helper -* @area: info about area to copy -* -* A wrapper around sys_copyarea implemented by fbdev core -*/ -void drm_fb_helper_sys_copyarea (struct fb_info *info, -const struct fb_copyarea *area) -{ -struct drm_fb_helper *helper = info->par; - -sys_copyarea (info, area); - -if (helper->funcs->fb_dirty) -drm_fb_helper_damage (helper, area->dx, area->dy, area->width, area->height); -} -EXPORT_SYMBOL (drm_fb_helper_sys_copyarea); - -/** -* drm_fb_helper_sys_imageblit - wrapper around sys_imageblit -* @info: fbdev registered by the helper -* @image: info about image to blit -* -* A wrapper around sys_imageblit implemented by fbdev core -*/ -void drm_fb_helper_sys_imageblit (struct fb_info *info, -const struct fb_image *image) -{ -struct drm_fb_helper *helper = info->par; - -sys_imageblit (info, image); - -if (helper->funcs->fb_dirty) -drm_fb_helper_damage (helper, image->dx, image->dy, image->width, image->height); -} -EXPORT_SYMBOL (drm_fb_helper_sys_imageblit); -/** * drm_fb_helper_cfb_read - Implements struct &fb_ops.fb_read for I/O memory * @info: fb_info struct pointer drivers/gpu/drm/drm_fbdev_generic.c +42
-5@@ -34,6 +34,43 @@ static int drm_fbdev_generic_fb_release(struct fb_info *info, int user)return 0 ; } +static ssize_t drm_fbdev_generic_fb_write (struct fb_info *info,const char __user *buf, +size_t count,loff_t *ppos) +{ +struct drm_fb_helper *helper = info->par; +loff_t pos = *ppos; +ssize_t ret; + + ret =fb_sys_write (info, buf, count, ppos); +if (ret >0 ) +drm_fb_helper_damage_range (helper, pos, ret); +return ret; +} + +static void drm_fbdev_generic_fb_fillrect (struct fb_info *info,const struct fb_fillrect *rect) +{ +struct drm_fb_helper *helper = info->par; + +sys_fillrect (info, rect); +drm_fb_helper_damage (helper, rect->dx, rect->dy, rect->width, rect->height); +} + +static void drm_fbdev_generic_fb_copyarea (struct fb_info *info,const struct fb_copyarea *area) +{ +struct drm_fb_helper *helper = info->par; + +sys_copyarea (info, area); +drm_fb_helper_damage (helper, area->dx, area->dy, area->width, area->height); +} + +static void drm_fbdev_generic_fb_imageblit (struct fb_info *info,const struct fb_image *image) +{ +struct drm_fb_helper *helper = info->par; + +sys_imageblit (info, image); +drm_fb_helper_damage (helper, image->dx, image->dy, image->width, image->height); +} +static void drm_fbdev_generic_fb_destroy (struct fb_info *info) {struct drm_fb_helper *fb_helper = info->par;@@ -56,12 +93,12 @@ static const struct fb_ops drm_fbdev_generic_fb_ops = { .owner = THIS_MODULE, .fb_open = drm_fbdev_generic_fb_open, .fb_release = drm_fbdev_generic_fb_release, - .fb_read = drm_fb_helper_sys_read, - .fb_write = drm_fb_helper_sys_write, + .fb_read = fb_sys_read, + .fb_write = drm_fbdev_generic_fb_write,DRM_FB_HELPER_DEFAULT_OPS , - .fb_fillrect = drm_fb_helper_sys_fillrect, - .fb_copyarea = drm_fb_helper_sys_copyarea, - .fb_imageblit = drm_fb_helper_sys_imageblit, + .fb_fillrect = drm_fbdev_generic_fb_fillrect, + .fb_copyarea = drm_fbdev_generic_fb_copyarea, + .fb_imageblit = drm_fbdev_generic_fb_imageblit, .fb_mmap = fb_deferred_io_mmap, .fb_destroy = drm_fbdev_generic_fb_destroy, };include/drm/drm_fb_helper.h +0
-42@@ -259,18 +259,6 @@ void drm_fb_helper_damage_range(struct drm_fb_helper *helper, off_t off, size_tvoid drm_fb_helper_deferred_io (struct fb_info *info,struct list_head *pagereflist); -ssize_t drm_fb_helper_sys_read (struct fb_info *info,char __user *buf, -size_t count,loff_t *ppos); -ssize_t drm_fb_helper_sys_write (struct fb_info *info,const char __user *buf, -size_t count,loff_t *ppos); - -void drm_fb_helper_sys_fillrect (struct fb_info *info, -const struct fb_fillrect *rect); -void drm_fb_helper_sys_copyarea (struct fb_info *info, -const struct fb_copyarea *area); -void drm_fb_helper_sys_imageblit (struct fb_info *info, -const struct fb_image *image); -ssize_t drm_fb_helper_cfb_read (struct fb_info *info,char __user *buf,size_t count,loff_t *ppos); ssize_t drm_fb_helper_cfb_write(struct fb_info *info, const char __user *buf,@@ -398,35 +386,6 @@ static inline int drm_fb_helper_defio_init(struct drm_fb_helper *fb_helper)return -ENODEV ; } -static inline ssize_t drm_fb_helper_sys_read (struct fb_info *info, -char __user *buf,size_t count, -loff_t *ppos) -{ -return -ENODEV ; -} - -static inline ssize_t drm_fb_helper_sys_write (struct fb_info *info, -const char __user *buf, -size_t count,loff_t *ppos) -{ -return -ENODEV ; -} - -static inline void drm_fb_helper_sys_fillrect (struct fb_info *info, -const struct fb_fillrect *rect) -{ -} - -static inline void drm_fb_helper_sys_copyarea (struct fb_info *info, -const struct fb_copyarea *area) -{ -} - -static inline void drm_fb_helper_sys_imageblit (struct fb_info *info, -const struct fb_image *image) -{ -} -static inline ssize_t drm_fb_helper_cfb_read (struct fb_info *info,char __user *buf,size_t count,loff_t *ppos) { --2.40.1
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)
Thomas Zimmermann
maintainerRe: [Freedreno] [PATCH v3 11/12] drm/fbdev-generic: Implement dedicated fbdev I/O helpers
Am 22.05.23 um 20:46 schrieb Thomas Zimmermann:
[...]
Quoted 6 lines
Quoted 4 lines
Looking at this patch makes me wonder if we should have implemented
fb_dirtyfor the MSM driver. We havedrm_framebuffer_funcs::dirty()implemented (by wrapping thedrm_atomic_helper_dirtyfb()).I think so. You'd need something similar to the generic fbdev emulation. But it's for a separate patchset. Apparently no one has complained so far.
I have another revision of these patches in the works and will add initial support for damage handling.
Quoted 305 lines
Best regards
ThomasQuoted 300 lines
Quoted 298 lines
drivers/gpu/drm/Kconfig +0
-0@@ -95,6 +95,7 @@ config DRM_KUNIT_TESTconfig
DRM_KMS_HELPER
tristate
depends on DRM
+ selectFB_SYS_HELPERS_DEFERREDifDRM_FBDEV_EMULATIONhelp
CRTC helpers for KMS drivers.drivers/gpu/drm/Kconfig +0
-0@@ -135,11 +136,6 @@ config DRM_FBDEV_EMULATIONselect
FB_CFB_FILLRECT
selectFB_CFB_COPYAREA
selectFB_CFB_IMAGEBLIT
- selectFB_DEFERRED_IO
- selectFB_SYS_FOPS
- selectFB_SYS_FILLRECT
- selectFB_SYS_COPYAREA
- selectFB_SYS_IMAGEBLIT
selectFRAMEBUFFER_CONSOLEif !EXPERT
selectFRAMEBUFFER_CONSOLE_DETECT_PRIMARYifFRAMEBUFFER_CONSOLEdefault ydrivers/gpu/drm/drm_fb_helper.c +0
-2@@ -729,113 +729,6 @@ void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagerefli } EXPORT_SYMBOL(drm_fb_helper_deferred_io); -/** -* drm_fb_helper_sys_read - Implements struct &fb_ops.fb_read for system memory
- * @info:fb_infostruct pointer
- * @buf: userspace buffer to read from framebuffer memory
- * @count: number of bytes to read from framebuffer memory
- * @ppos: read offset within framebuffer memory
- *
- * Returns:
- * The number of bytes read on success, or an error code otherwise.
- */drivers/gpu/drm/drm_fb_helper.c +0
-9-ssize_t drm_fb_helper_sys_read (struct fb_info *info,char __user *buf, - size_t count, loff_t *ppos) -{ - return fb_sys_read(info, buf, count, ppos); -} -EXPORT_SYMBOL (drm_fb_helper_sys_read); - -/** -* drm_fb_helper_sys_write - Implements struct &fb_ops.fb_write for system memory
- * @info:fb_infostruct pointer
- * @buf: userspace buffer to write to framebuffer memory
- * @count: number of bytes to write to framebuffer memory
- * @ppos: write offset within framebuffer memory
- *
- * Returns:
- * The number of bytes written on success, or an error code otherwise.
- */
-ssize_t drm_fb_helper_sys_write(structfb_info*info, const char__user*buf,
-size_tcount,loff_t*ppos)drivers/gpu/drm/drm_fb_helper.c +0
-12-{ - struct drm_fb_helper *helper = info->par; - loff_t pos = *ppos; - ssize_t ret; - struct drm_rect damage_area; - - ret = fb_sys_write(info, buf, count, ppos); - if (ret <= 0) - return ret; - - if (helper->funcs->fb_dirty) { - drm_fb_helper_memory_range_to_clip(info, pos, ret,
&damage_area);
- drm_fb_helper_damage(helper, damage_area.x1, damage_area.y1,
-drm_rect_width(&damage_area), -drm_rect_height(&damage_area)); - }drivers/gpu/drm/drm_fb_helper.c +0
-21- - return ret; -} -EXPORT_SYMBOL (drm_fb_helper_sys_write); - -/** -* drm_fb_helper_sys_fillrect - wrapper around sys_fillrect -* @info: fbdev registered by the helper -* @rect: info about rectangle to fill -* -* A wrapper around sys_fillrect implemented by fbdev core -*/ -void drm_fb_helper_sys_fillrect (struct fb_info *info, - const struct fb_fillrect *rect) -{ - struct drm_fb_helper *helper = info->par; - - sys_fillrect(info, rect); - - if (helper->funcs->fb_dirty) - drm_fb_helper_damage(helper, rect->dx, rect->dy,
rect->width,rect->height);drivers/gpu/drm/drm_fb_helper.c +0
-19-} -EXPORT_SYMBOL (drm_fb_helper_sys_fillrect); - -/** -* drm_fb_helper_sys_copyarea - wrapper around sys_copyarea -* @info: fbdev registered by the helper -* @area: info about area to copy -* -* A wrapper around sys_copyarea implemented by fbdev core -*/ -void drm_fb_helper_sys_copyarea (struct fb_info *info, - const struct fb_copyarea *area) -{ - struct drm_fb_helper *helper = info->par; - - sys_copyarea(info, area); - - if (helper->funcs->fb_dirty) - drm_fb_helper_damage(helper, area->dx, area->dy,
area->width,area->height);drivers/gpu/drm/drm_fb_helper.c +0
-19-} -EXPORT_SYMBOL (drm_fb_helper_sys_copyarea); - -/** -* drm_fb_helper_sys_imageblit - wrapper around sys_imageblit -* @info: fbdev registered by the helper -* @image: info about image to blit -* -* A wrapper around sys_imageblit implemented by fbdev core -*/ -void drm_fb_helper_sys_imageblit (struct fb_info *info, - const struct fb_image *image) -{ - struct drm_fb_helper *helper = info->par; - - sys_imageblit(info, image); - - if (helper->funcs->fb_dirty) - drm_fb_helper_damage(helper, image->dx, image->dy,
image->width,image->height);drivers/gpu/drm/drm_fb_helper.c +0
-3-} -EXPORT_SYMBOL (drm_fb_helper_sys_imageblit); -/**
*drm_fb_helper_cfb_read- Implements struct &fb_ops.fb_read for I/O memory
* @info:fb_infostruct pointerdrivers/gpu/drm/drm_fbdev_generic.c +19
-0@@ -34,6 +34,43 @@ static int drm_fbdev_generic_fb_release(struct fb_info *info, int user) return 0; } +static ssize_t drm_fbdev_generic_fb_write (struct fb_info *info,const char __user *buf, + size_t count, loff_t *ppos) +{ + struct drm_fb_helper *helper = info->par; + loff_t pos = *ppos; + ssize_t ret; + + ret = fb_sys_write(info, buf, count, ppos); + if (ret > 0) + drm_fb_helper_damage_range(helper, pos, ret); + return ret; +} + +static void drm_fbdev_generic_fb_fillrect (struct fb_info *info,const struct fb_fillrect *rect) +{ + struct drm_fb_helper *helper = info->par; + + sys_fillrect(info, rect); + drm_fb_helper_damage(helper, rect->dx, rect->dy, rect->width,
rect->height);drivers/gpu/drm/drm_fbdev_generic.c +3
-0+} + +static void drm_fbdev_generic_fb_copyarea(struct fb_info *info,const struct
fb_copyarea*area)drivers/gpu/drm/drm_fbdev_generic.c +5
-0+{ + struct drm_fb_helper *helper = info->par; + + sys_copyarea(info, area); + drm_fb_helper_damage(helper, area->dx, area->dy, area->width,
area->height);drivers/gpu/drm/drm_fbdev_generic.c +3
-0+} + +static void drm_fbdev_generic_fb_imageblit(struct fb_info *info,const struct
fb_image*image)drivers/gpu/drm/drm_fbdev_generic.c +5
-0+{ + struct drm_fb_helper *helper = info->par; + + sys_imageblit(info, image); + drm_fb_helper_damage(helper, image->dx, image->dy,
image->width,image->height);drivers/gpu/drm/drm_fbdev_generic.c +2
-0+} +static void
drm_fbdev_generic_fb_destroy(struct fb_info *info){
structdrm_fb_helper*fb_helper=info->par;drivers/gpu/drm/drm_fbdev_generic.c +5
-5@@ -56,12 +93,12 @@ static const struct fb_ops drm_fbdev_generic_fb_ops = { .owner = THIS_MODULE, .fb_open = drm_fbdev_generic_fb_open, .fb_release = drm_fbdev_generic_fb_release, - .fb_read = drm_fb_helper_sys_read, - .fb_write = drm_fb_helper_sys_write, + .fb_read = fb_sys_read, + .fb_write = drm_fbdev_generic_fb_write, DRM_FB_HELPER_DEFAULT_OPS, - .fb_fillrect = drm_fb_helper_sys_fillrect, - .fb_copyarea = drm_fb_helper_sys_copyarea, - .fb_imageblit = drm_fb_helper_sys_imageblit, + .fb_fillrect = drm_fbdev_generic_fb_fillrect, + .fb_copyarea = drm_fbdev_generic_fb_copyarea, + .fb_imageblit = drm_fbdev_generic_fb_imageblit, .fb_mmap = fb_deferred_io_mmap, .fb_destroy = drm_fbdev_generic_fb_destroy,};
include/drm/drm_fb_helper.h +0
-0@@ -259,18 +259,6 @@ void drm_fb_helper_damage_range(struct
drm_fb_helper*helper,off_toff,size_tvoid
drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagereflist);include/drm/drm_fb_helper.h +0
-3-ssize_t drm_fb_helper_sys_read (struct fb_info *info,char __user *buf, - size_t count, loff_t *ppos); -ssize_t drm_fb_helper_sys_write(struct fb_info *info, const char
__user*buf,
-size_tcount,loff_t*ppos);include/drm/drm_fb_helper.h +0
-8- -void drm_fb_helper_sys_fillrect (struct fb_info *info, - const struct fb_fillrect *rect); -void drm_fb_helper_sys_copyarea (struct fb_info *info, - const struct fb_copyarea *area); -void drm_fb_helper_sys_imageblit (struct fb_info *info, - const struct fb_image *image); -
ssize_tdrm_fb_helper_cfb_read(struct fb_info *info, char __user *buf, size_t count, loff_t *ppos);ssize_tdrm_fb_helper_cfb_write(structfb_info*info, const char__user*buf,include/drm/drm_fb_helper.h +0
-16@@ -398,35 +386,6 @@ static inline int drm_fb_helper_defio_init(struct drm_fb_helper *fb_helper) return -ENODEV; } -static inline ssize_t drm_fb_helper_sys_read (struct fb_info *info, - char __user *buf, size_t count, - loff_t *ppos) -{ - return -ENODEV; -} - -static inline ssize_t drm_fb_helper_sys_write (struct fb_info *info, - const char __user *buf, - size_t count, loff_t *ppos) -{ - return -ENODEV; -} - -static inline void drm_fb_helper_sys_fillrect(struct fb_info *info, - const struct
fb_fillrect*rect)include/drm/drm_fb_helper.h +0
-5-{ -} - -static inline void drm_fb_helper_sys_copyarea(struct fb_info *info, - const struct
fb_copyarea*area)include/drm/drm_fb_helper.h +0
-5-{ -} - -static inline void drm_fb_helper_sys_imageblit (struct fb_info *info, - const struct fb_image*image)
include/drm/drm_fb_helper.h +0
-3-{ -} -static inline
ssize_tdrm_fb_helper_cfb_read(struct fb_info *info, char __user *buf, size_t count, loff_t *ppos){Signature · 1 line
2.40.1
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)
Thomas Zimmermann
maintainerPATCH v3 12/12 drm/i915: Implement dedicated fbdev I/O helpers
In reply to Thomas ZimmermannImplement dedicated fbdev helpers for framebuffer I/O instead of using DRM's helpers. i915 was the only caller of the DRM helpers, so remove them from the helper module.
v2:
* use FB_IO_HELPERS options
--- drivers/gpu/drm/Kconfig | 3 - drivers/gpu/drm/drm_fb_helper.c | 107 --------------------- drivers/gpu/drm/i915/Kconfig | 1 + drivers/gpu/drm/i915/display/intel_fbdev.c | 51 ++++++++-- include/drm/drm_fb_helper.h | 39 -------- 5 files changed, 46 insertions(+), 155 deletions(-)
drivers/gpu/drm/Kconfig +0 -3
@@ -133,9 +133,6 @@ config DRM_FBDEV_EMULATION bool "Enable legacy fbdev support for your modesetting driver" depends on DRM_KMS_HELPER depends on FB=y || FB=DRM_KMS_HELPER - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT select FRAMEBUFFER_CONSOLE if !EXPERT select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE default y
drivers/gpu/drm/drm_fb_helper.c +0 -107
113 lines not on this page · raw message
drivers/gpu/drm/i915/Kconfig +1 -0
@@ -17,6 +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 RELAY select I2C select I2C_ALGOBIT
drivers/gpu/drm/i915/display/intel_fbdev.c +45 -6
76 lines not on this page · raw message
include/drm/drm_fb_helper.h +0 -39
@@ -259,18 +259,6 @@ void drm_fb_helper_damage_range(struct drm_fb_helper *helper, off_t off, size_tvoid drm_fb_helper_deferred_io (struct fb_info *info,struct list_head *pagereflist); -ssize_t drm_fb_helper_cfb_read (struct fb_info *info,char __user *buf, -size_t count,loff_t *ppos); -ssize_t drm_fb_helper_cfb_write (struct fb_info *info,const char __user *buf, -size_t count,loff_t *ppos); - -void drm_fb_helper_cfb_fillrect (struct fb_info *info, -const struct fb_fillrect *rect); -void drm_fb_helper_cfb_copyarea (struct fb_info *info, -const struct fb_copyarea *area); -void drm_fb_helper_cfb_imageblit (struct fb_info *info, -const struct fb_image *image); -void drm_fb_helper_set_suspend (struct drm_fb_helper *fb_helper,bool suspend);void drm_fb_helper_set_suspend_unlocked (struct drm_fb_helper *fb_helper,bool suspend);
@@ -386,33 +374,6 @@ static inline int drm_fb_helper_defio_init(struct drm_fb_helper *fb_helper)return -ENODEV ; } -static inline ssize_t drm_fb_helper_cfb_read (struct fb_info *info,char __user *buf, -size_t count,loff_t *ppos) -{ -return -ENODEV ; -} - -static inline ssize_t drm_fb_helper_cfb_write (struct fb_info *info,const char __user *buf, -size_t count,loff_t *ppos) -{ -return -ENODEV ; -} - -static inline void drm_fb_helper_cfb_fillrect (struct fb_info *info, -const struct fb_fillrect *rect) -{ -} - -static inline void drm_fb_helper_cfb_copyarea (struct fb_info *info, -const struct fb_copyarea *area) -{ -} - -static inline void drm_fb_helper_cfb_imageblit (struct fb_info *info, -const struct fb_image *image) -{ -} -static inline void drm_fb_helper_set_suspend (struct drm_fb_helper *fb_helper,bool suspend) {
Signature · 1 line
2.40.1
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/fbdev: Remove DRM's helpers for fbdev I/O (rev3)
In reply to Thomas Zimmermann== Series Details ==
== Series Details ==
Series: drm/fbdev: Remove DRM's helpers for fbdev I/O (rev3)
URL : https://patchwork.freedesktop.org/series/117671/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13174 -> Patchwork_117671v3
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/index.html
Participating hosts (39 -> 39)
------------------------------
Additional (1): fi-kbl-soraka
Missing (1): fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_117671v3 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#2190])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/fi-kbl-soraka/igt@[email protected]
* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#4613]) +3 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/fi-kbl-soraka/igt@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [PASS][3] -> [DMESG-FAIL][4] ([i915#5334])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@gt_lrc:
- bat-dg1-5: [PASS][5] -> [ABORT][6] ([i915#4983])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/bat-dg1-5/igt@i915_selftest@live@gt_lrc.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/bat-dg1-5/igt@i915_selftest@live@gt_lrc.html
* igt@i915_selftest@live@gt_pm:
- bat-rpls-2: [PASS][7] -> [DMESG-FAIL][8] ([i915#4258] / [i915#7913])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][9] ([i915#1886] / [i915#7913])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@reset:
- bat-rpls-1: [PASS][10] -> [ABORT][11] ([i915#4983] / [i915#7461] / [i915#8347] / [i915#8384])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/bat-rpls-1/igt@i915_selftest@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@slpc:
- bat-rpls-2: NOTRUN -> [DMESG-WARN][12] ([i915#6367])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/bat-rpls-2/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s2idle-without-i915:
- bat-rpls-2: NOTRUN -> [ABORT][13] ([i915#6687])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/bat-rpls-2/igt@[email protected]
* igt@kms_chamelium_frames@hdmi-crc-fast:
- fi-kbl-soraka: NOTRUN -> [SKIP][14] ([fdo#109271]) +14 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/fi-kbl-soraka/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1:
- bat-dg2-8: [PASS][15] -> [FAIL][16] ([i915#7932])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
* igt@kms_setmode@basic-clone-single-crtc:
- fi-kbl-soraka: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#4579])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/fi-kbl-soraka/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@reset:
- bat-rpls-2: [INCOMPLETE][18] ([i915#7913] / [i915#8347]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/bat-rpls-2/igt@i915_selftest@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/bat-rpls-2/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@slpc:
- {bat-mtlp-6}: [DMESG-WARN][20] ([i915#6367]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/bat-mtlp-6/igt@i915_selftest@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/bat-mtlp-6/igt@i915_selftest@[email protected]
- {bat-mtlp-8}: [DMESG-WARN][22] ([i915#6367]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/bat-mtlp-8/igt@i915_selftest@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/bat-mtlp-8/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@kms_setmode@basic-clone-single-crtc:
- bat-rplp-1: [SKIP][24] ([i915#3555] / [i915#4579]) -> [ABORT][25] ([i915#4579] / [i915#8260])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/bat-rplp-1/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/bat-rplp-1/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8189]: https://gitlab.freedesktop.org/drm/intel/issues/8189
[i915#8260]: https://gitlab.freedesktop.org/drm/intel/issues/8260
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
[i915#8384]: https://gitlab.freedesktop.org/drm/intel/issues/8384
[i915#8497]: https://gitlab.freedesktop.org/drm/intel/issues/8497
Build changes
-------------
* Linux: CI_DRM_13174 -> Patchwork_117671v3
CI-20190529: 20190529
CI_DRM_13174: 00e64f04fac388222f3a8407848e185b3ade4256 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7299: 3effd4be7f6c867d942532b3fe18d6c54fffbd7a @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_117671v3: 00e64f04fac388222f3a8407848e185b3ade4256 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
bfe3f988de2f drm/i915: Implement dedicated fbdev I/O helpers 853f515cd353 drm/fbdev-generic: Implement dedicated fbdev I/O helpers f2f712e3f710 drm/fb-helper: Export helpers for marking damage areas 6aa31a44bd43 drm/tegra: Use regular fbdev I/O helpers e3080c41c2aa drm/omapdrm: Use regular fbdev I/O helpers 1bdd4e08194b drm/msm: Use regular fbdev I/O helpers c096103d2ac6 drm/fbdev-dma: Use regular fbdev I/O helpers ca1c2a2b5143 drm/radeon: Use regular fbdev I/O helpers 0843c745550f drm/gma500: Use regular fbdev I/O helpers 089904cf735a drm/exynos: Use regular fbdev I/O helpers 576d812c7c6b drm/armada: Use regular fbdev I/O helpers fecdfd5ee28d fbdev: Add Kconfig options to select different fb_ops helpers
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/fbdev: Remove DRM's helpers for fbdev I/O (rev3)
In reply to Thomas Zimmermann== Series Details ==
== Series Details ==
Series: drm/fbdev: Remove DRM's helpers for fbdev I/O (rev3)
URL : https://patchwork.freedesktop.org/series/117671/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_13174_full -> Patchwork_117671v3_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_117671v3_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_117671v3_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_117671v3_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_schedule@noreorder-priority@bcs0:
- shard-apl: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-apl3/igt@gem_exec_schedule@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-apl6/igt@gem_exec_schedule@[email protected]
* igt@gem_exec_schedule@noreorder-priority@rcs0:
- shard-apl: [PASS][3] -> [ABORT][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-apl3/igt@gem_exec_schedule@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-apl6/igt@gem_exec_schedule@[email protected]
* {igt@kms_display_modes@extended-mode-basic@pipe-a-hdmi-a-1-pipe-b-vga-1} (NEW):
- shard-snb: NOTRUN -> [FAIL][5] +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-snb1/igt@kms_display_modes@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_pm_rpm@system-suspend:
- {shard-dg1}: [PASS][6] -> [INCOMPLETE][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-dg1-18/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-dg1-13/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_13174_full and Patchwork_117671v3_full:
### New IGT tests (4) ###
* igt@kms_display_modes@extended-mode-basic@pipe-a-hdmi-a-1-pipe-b-vga-1:
- Statuses : 1 fail(s)
- Exec time: [0.0] s
* igt@kms_display_modes@extended-mode-basic@pipe-a-vga-1-pipe-b-hdmi-a-1:
- Statuses : 1 fail(s)
- Exec time: [0.0] s
* igt@kms_display_modes@extended-mode-basic@pipe-b-hdmi-a-1-pipe-a-vga-1:
- Statuses : 1 fail(s)
- Exec time: [0.0] s
* igt@kms_display_modes@extended-mode-basic@pipe-b-vga-1-pipe-a-hdmi-a-1:
- Statuses : 1 fail(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_117671v3_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@engines-hostile-preempt:
- shard-snb: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#1099])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-snb4/igt@[email protected]
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [PASS][9] -> [FAIL][10] ([i915#2842])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-apl2/igt@gem_exec_fair@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-apl1/igt@gem_exec_fair@[email protected]
* igt@gem_workarounds@suspend-resume-fd:
- shard-apl: [PASS][11] -> [ABORT][12] ([i915#180])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-apl2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-apl1/igt@[email protected]
* igt@i915_module_load@load:
- shard-snb: NOTRUN -> [SKIP][13] ([fdo#109271] / [i915#6227])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-snb4/igt@[email protected]
* igt@i915_pm_rps@reset:
- shard-snb: [PASS][14] -> [INCOMPLETE][15] ([i915#7790])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-snb6/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-snb2/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-glk: [PASS][16] -> [FAIL][17] ([i915#2346])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-glk6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-glk4/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-dp1:
- shard-apl: [PASS][18] -> [FAIL][19] ([i915#79])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-apl6/igt@kms_flip@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-apl6/igt@kms_flip@[email protected]
* igt@kms_plane_scaling@plane-upscale-with-modifiers-factor-0-25@pipe-a-vga-1:
- shard-snb: NOTRUN -> [SKIP][20] ([fdo#109271]) +66 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-snb4/igt@kms_plane_scaling@[email protected]
* igt@kms_plane_scaling@planes-downscale-factor-0-5-unity-scaling@pipe-b-vga-1:
- shard-snb: NOTRUN -> [SKIP][21] ([fdo#109271] / [i915#4579]) +15 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-snb5/igt@kms_plane_scaling@[email protected]
* igt@kms_setmode@basic@pipe-a-vga-1:
- shard-snb: NOTRUN -> [FAIL][22] ([i915#5465]) +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-snb4/igt@kms_setmode@[email protected]
* igt@kms_vblank@pipe-b-query-forked:
- shard-snb: [PASS][23] -> [SKIP][24] ([fdo#109271])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-snb2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-snb6/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [FAIL][25] ([i915#2846]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-glk7/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-glk9/igt@[email protected]
* igt@gem_exec_fair@basic-throttle@rcs0:
- {shard-rkl}: [FAIL][27] ([i915#2842]) -> [PASS][28] +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-rkl-4/igt@gem_exec_fair@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-rkl-4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_suspend@basic-s4-devices@lmem0:
- {shard-dg1}: [ABORT][29] ([i915#7975] / [i915#8213]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-dg1-14/igt@gem_exec_suspend@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-dg1-18/igt@gem_exec_suspend@[email protected]
* igt@gem_mmap_gtt@fault-concurrent-x:
- shard-snb: [ABORT][31] ([i915#5161]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-snb2/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-snb4/igt@[email protected]
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-180-async-flip:
- {shard-rkl}: [FAIL][33] ([i915#3743]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-rkl-7/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-rkl-1/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html
* igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
- shard-snb: [SKIP][35] ([fdo#109271]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-snb6/igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-snb1/igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-apl: [FAIL][37] ([i915#2346]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-apl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-apl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@single-move@pipe-b:
- {shard-rkl}: [INCOMPLETE][39] ([i915#8011]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-rkl-7/igt@kms_cursor_legacy@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-rkl-1/igt@kms_cursor_legacy@[email protected]
* igt@kms_flip@2x-plain-flip-ts-check-interruptible@ac-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][41] ([i915#2122]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-glk4/igt@kms_flip@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-glk7/igt@kms_flip@[email protected]
* igt@perf_pmu@idle@rcs0:
- {shard-rkl}: [FAIL][43] ([i915#4349]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13174/shard-rkl-4/igt@perf_pmu@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/shard-rkl-2/igt@perf_pmu@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4936]: https://gitlab.freedesktop.org/drm/intel/issues/4936
[i915#5161]: https://gitlab.freedesktop.org/drm/intel/issues/5161
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5465]: https://gitlab.freedesktop.org/drm/intel/issues/5465
[i915#5493]: https://gitlab.freedesktop.org/drm/intel/issues/5493
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7790]: https://gitlab.freedesktop.org/drm/intel/issues/7790
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8213]: https://gitlab.freedesktop.org/drm/intel/issues/8213
[i915#8381]: https://gitlab.freedesktop.org/drm/intel/issues/8381
[i915#8414]: https://gitlab.freedesktop.org/drm/intel/issues/8414
Build changes
-------------
* Linux: CI_DRM_13174 -> Patchwork_117671v3
CI-20190529: 20190529
CI_DRM_13174: 00e64f04fac388222f3a8407848e185b3ade4256 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7299: 3effd4be7f6c867d942532b3fe18d6c54fffbd7a @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_117671v3: 00e64f04fac388222f3a8407848e185b3ade4256 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117671v3/index.html