drm: Provide fbdev emulation per memory manager
Subsystems (44)
Thomas Zimmermann
maintainerv3 cover drm: Provide fbdev emulation per memory manager
DRM provides 3 different memory managers with slightly different
characteristics: DMA-based, SHMEM-based and TTM. This affects fbdev emulation as each requires different handling of mmap(). This series reworks fbdev emulation to provide an optimized emulation for each of the memory managers.
Patch 1 fixes a minor bug in fbdev-generic.
Patches 2 to 8 implement fbdev-shmem, which is optimized for drivers with SHMEM-based allocation. Patches 2 to 7 prepare deferred I/O to support driver-custom page lookups. When the mmap'ed framebuffer sees a pagefault, the deferred-I/O code can ask the graphics driver of the page (instead of trying to detect it by itself). Using this hook, patch 8 implements fbdev-shmem. The code is similar to fbdev-generic, but does not require an additional shadow buffer for mmap(). Mmap'ed pages are instead provided from the GEM buffer object. That saves a few MiB of framebuffer memory and copying between the internal buffers.
Patches 9 to 20 convert SHMEM-based drivers to fbdev-shmem.
Patch 21 adds damage handling and deferred I/O to fbdev-dma. Such code has been tested on the DMA-based omapdrm and can be adopted for all drivers.
Patches 22 to 41 convert DMA-based drivers to fbdev-dma. These drivers could not use it because of the missing support for damage handling.
Patch 42 renames fbdev-generic to fbdev-ttm. Only TTM-based drivers still use it, so building it can be linked to TTM as well.
Patch 43 cleans up the documentation.
Tested with simpledrm, vc4 and amdgpu.
v3:
- fbdev-dma: init fb_ops with DMAMEM initializer (Javier)
- fbdev-shmem: clarify get_page usage (Javier) v2:
- fbdev-shmem: use drm_driver_legacy_fb_format() (Geert)
- fix a few typos
Thomas Zimmermann (43):
drm/fbdev-generic: Do not set physical framebuffer address fbdev/deferred-io: Move pageref setup into separate helper fbdev/deferred-io: Clean up pageref on lastclose fbdev/deferred-io: Test screen_buffer for vmalloc'ed memory fbdev/deferred-io: Test smem_start for I/O memory fbdev/deferred-io: Always call get_page() for framebuffer pages fbdev/deferred-io: Provide get_page hook in struct fb_deferred_io drm/fbdev: Add fbdev-shmem
drm/ast: Use fbdev-shmem
drm/gud: Use fbdev-shmem
drm/hyperv: Use fbdev-shmem
drm/mgag200: Use fbdev-shmem
drm/solomon: Use fbdev-shmem
drm/tiny/cirrus: Use fbdev-shmem
drm/tiny/gm12u320: Use fbdev-shmem
drm/tiny/ofdrm: Use fbdev-shmem
drm/tiny/simpledrm: Use fbdev-shmem
drm/udl: Use fbdev-shmem
drm/virtio: Use fbdev-shmem
drm/vkms: Use fbdev-shmem
drm/fbdev-dma: Implement damage handling and deferred I/O drm/arm/komeda: Use fbdev-dma
drm/hisilicon/kirin: Use fbdev-dma
drm/imx/lcdc: Use fbdev-dma
drm/ingenic: Use fbdev-dma
drm/mediatek: Use fbdev-dma drm/panel/panel-ilitek-9341: Use fbdev-dma drm/renesas/rcar-du: Use fbdev-dma
drm/renesas/rz-du: Use fbdev-dma
drm/renesas/shmobile: Use fbdev-dma
drm/rockchip: Use fbdev-dma
drm/tiny/hx8357d: Use fbdev-dma
drm/tiny/ili9163: Use fbdev-dma
drm/tiny/ili9225: Use fbdev-dma
drm/tiny/ili9341: Use fbdev-dma
drm/tiny/ili9486: Use fbdev-dma
drm/tiny/mi0283qt: Use fbdev-dma drm/tiny/panel-mipi-dbi: Use fbdev-dma drm/tiny/repaper: Use fbdev-dma
drm/tiny/st7586: Use fbdev-dma
drm/tiny/st7735r: Use fbdev-dma
drm/fbdev-generic: Convert to fbdev-ttm
drm/fbdev: Clean up fbdev documentation
Documentation/gpu/drm-kms-helpers.rst | 12 +-
Documentation/gpu/todo.rst | 13 -
drivers/gpu/drm/Makefile | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +-
.../gpu/drm/arm/display/komeda/komeda_drv.c | 4 +-
drivers/gpu/drm/ast/ast_drv.c | 4 +-
drivers/gpu/drm/drm_drv.c | 2 +-
drivers/gpu/drm/drm_fb_helper.c | 11 +-
drivers/gpu/drm/drm_fbdev_dma.c | 65 +++-
drivers/gpu/drm/drm_fbdev_shmem.c | 316 ++++++++++++++++++
.../{drm_fbdev_generic.c => drm_fbdev_ttm.c} | 81 +++--
drivers/gpu/drm/gud/gud_drv.c | 4 +-
.../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +-
.../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 4 +-
drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +-
drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 4 +-
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +-
drivers/gpu/drm/loongson/Kconfig | 1 +
drivers/gpu/drm/loongson/lsdc_drv.c | 4 +-
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +-
drivers/gpu/drm/mgag200/mgag200_drv.c | 4 +-
drivers/gpu/drm/nouveau/nouveau_drm.c | 6 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +-
drivers/gpu/drm/qxl/qxl_drv.c | 4 +-
drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 4 +-
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 4 +-
.../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 4 +-
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 +-
drivers/gpu/drm/solomon/ssd130x.c | 4 +-
drivers/gpu/drm/tiny/bochs.c | 4 +-
drivers/gpu/drm/tiny/cirrus.c | 4 +-
drivers/gpu/drm/tiny/gm12u320.c | 4 +-
drivers/gpu/drm/tiny/hx8357d.c | 4 +-
drivers/gpu/drm/tiny/ili9163.c | 4 +-
drivers/gpu/drm/tiny/ili9225.c | 4 +-
drivers/gpu/drm/tiny/ili9341.c | 4 +-
drivers/gpu/drm/tiny/ili9486.c | 4 +-
drivers/gpu/drm/tiny/mi0283qt.c | 4 +-
drivers/gpu/drm/tiny/ofdrm.c | 4 +-
drivers/gpu/drm/tiny/panel-mipi-dbi.c | 4 +-
drivers/gpu/drm/tiny/repaper.c | 4 +-
drivers/gpu/drm/tiny/simpledrm.c | 4 +-
drivers/gpu/drm/tiny/st7586.c | 4 +-
drivers/gpu/drm/tiny/st7735r.c | 4 +-
drivers/gpu/drm/udl/udl_drv.c | 4 +-
drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 +-
drivers/gpu/drm/virtio/virtgpu_drv.c | 4 +-
drivers/gpu/drm/vkms/vkms_drv.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +-
drivers/video/fbdev/core/fb_defio.c | 82 +++--
include/drm/drm_fbdev_generic.h | 15 -
include/drm/drm_fbdev_shmem.h | 15 +
include/drm/drm_fbdev_ttm.h | 15 +
include/drm/drm_mode_config.h | 4 +-
include/linux/fb.h | 1 +
55 files changed, 593 insertions(+), 210 deletions(-)
create mode 100644 drivers/gpu/drm/drm_fbdev_shmem.c
rename drivers/gpu/drm/{drm_fbdev_generic.c => drm_fbdev_ttm.c} (76%)
delete mode 100644 include/drm/drm_fbdev_generic.h
create mode 100644 include/drm/drm_fbdev_shmem.h
create mode 100644 include/drm/drm_fbdev_ttm.hSignature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 1/43 drm/fbdev-generic: Do not set physical framebuffer address
Framebuffer memory is allocated via vzalloc() from non-contiguous physical pages. The physical framebuffer start address is therefore meaningless. Do not set it.
The value is not used within the kernel and only exported to userspace on dedicated ARM configs. No functional change is expected.
v2:
- refer to vzalloc() in commit message (Javier)
--- drivers/gpu/drm/drm_fbdev_generic.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/drm_fbdev_generic.c +0 -1
@@ -113,7 +113,6 @@ static int drm_fbdev_generic_helper_fb_probe(struct drm_fb_helper *fb_helper,/* screen */ info->flags |=FBINFO_VIRTFB |FBINFO_READS_FAST ; info->screen_buffer = screen_buffer; - info->fix.smem_start =page_to_phys (vmalloc_to_page (info->screen_buffer)); info->fix.smem_len = screen_size;/* deferred I/O */
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 2/43 fbdev/deferred-io: Move pageref setup into separate helper
In reply to Thomas ZimmermannSet up struct fb_deferred_io_pageref in the new helper function fb_deferred_io_pageref_lookup(), which runs when the pageref is first taken. Remove the setup code from the rest of the code.
At first, the code allocates the memory of all pageref structs. The setup of the various fields happens when the pageref is required.
v2:
- fix typo in commit message (Javier)
--- drivers/video/fbdev/core/fb_defio.c | 42 ++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 12 deletions(-)
drivers/video/fbdev/core/fb_defio.c +30 -12
@@ -36,20 +36,43 @@ static struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offsreturn page; } +static struct fb_deferred_io_pageref *fb_deferred_io_pageref_lookup (struct fb_info *info, +unsigned long offset, +struct page *page) +{ +unsigned long pgoff = offset >>PAGE_SHIFT ; +struct fb_deferred_io_pageref *pageref; + +if (fb_WARN_ON_ONCE (info, pgoff >= info->npagerefs)) +return NULL ;/* incorrect allocation size */ + +/* 1:1 mapping between pageref and page offset */ + pageref = &info->pagerefs[pgoff]; + +if (pageref->page) + goto out; + + pageref->page = page; + pageref->offset = pgoff <<PAGE_SHIFT ; +INIT_LIST_HEAD (&pageref->list); + +out: +if (fb_WARN_ON_ONCE (info, pageref->page != page)) +return NULL ;/* inconsistent state */ +return pageref; +} +static struct fb_deferred_io_pageref *fb_deferred_io_pageref_get (struct fb_info *info,unsigned long offset,struct page *page) {struct fb_deferred_io *fbdefio = info->fbdefio;struct list_head *pos = &fbdefio->pagereflist; -unsigned long pgoff = offset >>PAGE_SHIFT ;struct fb_deferred_io_pageref *pageref, *cur; -if (WARN_ON_ONCE (pgoff >= info->npagerefs)) -return NULL ;/* incorrect allocation size */ - -/* 1:1 mapping between pageref and page offset */ - pageref = &info->pagerefs[pgoff]; + pageref =fb_deferred_io_pageref_lookup (info, offset, page); +if (!pageref) +return NULL ;/* * This check is to catch the case where a new process could start
@@ -60,9 +83,6 @@ static struct fb_deferred_io_pageref *fb_deferred_io_pageref_get(struct fb_infoif (!list_empty (&pageref->list)) goto pageref_already_added; - pageref->page = page; - pageref->offset = pgoff <<PAGE_SHIFT ; -if (unlikely (fbdefio->sort_pagereflist)) {/* * We loop through the list of pagerefs before adding in
@@ -264,7 +284,7 @@ int fb_deferred_io_init(struct fb_info *info) {struct fb_deferred_io *fbdefio = info->fbdefio;struct fb_deferred_io_pageref *pagerefs; -unsigned long npagerefs, i; +unsigned long npagerefs;int ret;BUG_ON (!fbdefio);
@@ -286,8 +306,6 @@ int fb_deferred_io_init(struct fb_info *info) ret = -ENOMEM ; goto err; } -for (i =0 ; i < npagerefs; ++i) -INIT_LIST_HEAD (&pagerefs[i].list); info->npagerefs = npagerefs; info->pagerefs = pagerefs;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 3/43 fbdev/deferred-io: Clean up pageref on lastclose
In reply to Thomas ZimmermannClean up the pageref state as part of the lastclose helper. This only requires to clear the page's mapping field. The pageref and page can stay in place for the next opened instance of the frame- buffer file.
With the change in the clean-up logic, there's no further need to look up pages during the lastclose cleanup. The code instead uses the existing pagerefs in its look-up table. It also avoids using smem_len, which some driver might not set correctly.
v2:
- fix typos in commit message (Javier)
--- drivers/video/fbdev/core/fb_defio.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/video/fbdev/core/fb_defio.c +11 -6
@@ -62,6 +62,14 @@ static struct fb_deferred_io_pageref *fb_deferred_io_pageref_lookup(struct fb_inreturn pageref; } +static void fb_deferred_io_pageref_clear (struct fb_deferred_io_pageref *pageref) +{ +struct page *page = pageref->page; + +if (page) + page->mapping =NULL ; +} +static struct fb_deferred_io_pageref *fb_deferred_io_pageref_get (struct fb_info *info,unsigned long offset,struct page *page)
@@ -330,16 +338,13 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_open);static void fb_deferred_io_lastclose (struct fb_info *info) { -struct page *page; -int i; +unsigned long i;flush_delayed_work (&info->deferred_work);/* clear out the mapping that we setup */ -for (i =0 ; i < info->fix.smem_len; i +=PAGE_SIZE ) { - page =fb_deferred_io_page (info, i); - page->mapping =NULL ; - } +for (i =0 ; i < info->npagerefs; ++i) +fb_deferred_io_pageref_clear (&info->pagerefs[i]); }void fb_deferred_io_release (struct fb_info *info)
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 4/43 fbdev/deferred-io: Test screen_buffer for vmalloc'ed memory
In reply to Thomas ZimmermannFramebuffers in virtual memory are available via screen_buffer. Use it instead of screen_base and avoid the type casting.
--- drivers/video/fbdev/core/fb_defio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/video/fbdev/core/fb_defio.c +3 -3
@@ -25,11 +25,11 @@static struct page *fb_deferred_io_page (struct fb_info *info,unsigned long offs) { -void *screen_base = (void __force *) info->screen_base; +const void *screen_buffer = info->screen_buffer;struct page *page; -if (is_vmalloc_addr (screen_base + offs)) - page =vmalloc_to_page (screen_base + offs); +if (is_vmalloc_addr (screen_buffer + offs)) + page =vmalloc_to_page (screen_buffer + offs);else page =pfn_to_page ((info->fix.smem_start + offs) >>PAGE_SHIFT );
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 5/43 fbdev/deferred-io: Test smem_start for I/O memory
In reply to Thomas ZimmermannTest smem_start before looking up pages from its value. Return NULL if it is unset. This will result in a SIGBUS signal.
--- drivers/video/fbdev/core/fb_defio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/core/fb_defio.c +2 -2
@@ -26,11 +26,11 @@static struct page *fb_deferred_io_page (struct fb_info *info,unsigned long offs) {const void *screen_buffer = info->screen_buffer; -struct page *page; +struct page *page =NULL ;if (is_vmalloc_addr (screen_buffer + offs)) page =vmalloc_to_page (screen_buffer + offs); -else +else if (info->fix.smem_start) page =pfn_to_page ((info->fix.smem_start + offs) >>PAGE_SHIFT );return page;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 6/43 fbdev/deferred-io: Always call get_page() for framebuffer pages
In reply to Thomas ZimmermannUnconditionally call get_page() after looking up a page from the framebuffer memory. Guarantees that we always hold a reference.
This change also refactors the code such that it can support a driver-supplied get_page helper. This will be useful for DRM's fbdev emulation.
--- drivers/video/fbdev/core/fb_defio.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/video/fbdev/core/fb_defio.c +5 -4
@@ -23,7 +23,7 @@#include <linux/rmap.h> #include <linux/pagemap.h> -static struct page *fb_deferred_io_page (struct fb_info *info,unsigned long offs) +static struct page *fb_deferred_io_get_page (struct fb_info *info,unsigned long offs) {const void *screen_buffer = info->screen_buffer;struct page *page =NULL ;
@@ -33,6 +33,9 @@ static struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offselse if (info->fix.smem_start) page =pfn_to_page ((info->fix.smem_start + offs) >>PAGE_SHIFT ); +if (page) +get_page (page); +return page; }
@@ -129,12 +132,10 @@ static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf)if (offset >= info->fix.smem_len)return VM_FAULT_SIGBUS ; - page =fb_deferred_io_page (info, offset); + page =fb_deferred_io_get_page (info, offset);if (!page)return VM_FAULT_SIGBUS ; -get_page (page); -if (vmf->vma->vm_file) page->mapping = vmf->vma->vm_file->f_mapping;else
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 7/43 fbdev/deferred-io: Provide get_page hook in struct fb_deferred_io
In reply to Thomas ZimmermannAdd a callback for drivers to provide framebuffer pages to fbdev's deferred-I/O helpers. Implementations need to acquire a reference on the page before returning it. Returning NULL generates a SIGBUS signal.
This will be useful for DRM's fbdev emulation with GEM-shmem buffer objects.
v2:
- fix typo in commit message (Javier)
--- drivers/video/fbdev/core/fb_defio.c | 4 ++++ include/linux/fb.h | 1 + 2 files changed, 5 insertions(+)
drivers/video/fbdev/core/fb_defio.c +4 -0
@@ -25,9 +25,13 @@static struct page *fb_deferred_io_get_page (struct fb_info *info,unsigned long offs) { +struct fb_deferred_io *fbdefio = info->fbdefio;const void *screen_buffer = info->screen_buffer;struct page *page =NULL ; +if (fbdefio->get_page) +return fbdefio->get_page (info, offs); +if (is_vmalloc_addr (screen_buffer + offs)) page =vmalloc_to_page (screen_buffer + offs);else if (info->fix.smem_start)
include/linux/fb.h +1 -0
@@ -225,6 +225,7 @@ struct fb_deferred_io {struct mutex lock;/* mutex that protects the pageref list */ struct list_head pagereflist;/* list of pagerefs for touched pages */ /* callback */ +struct page *(*get_page)(struct fb_info *info,unsigned long offset); void (*deferred_io)(struct fb_info *info, struct list_head *pagelist); };#endif
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 9/43 drm/ast: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/ast/ast_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/ast/ast_drv.c +2 -2
@@ -33,7 +33,7 @@#include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_gem_shmem_helper.h> #include <drm/drm_module.h> #include <drm/drm_probe_helper.h>
@@ -360,7 +360,7 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret)return ret; -drm_fbdev_generic_setup (drm,32 ); +drm_fbdev_shmem_setup (drm,32 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 10/43 drm/gud: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/gud/gud_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/gud/gud_drv.c +2 -2
@@ -18,7 +18,7 @@#include <drm/drm_damage_helper.h> #include <drm/drm_debugfs.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_fourcc.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
@@ -622,7 +622,7 @@ static int gud_probe(struct usb_interface *intf, const struct usb_device_id *id)drm_kms_helper_poll_init (drm); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_shmem_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 8/43 drm/fbdev: Add fbdev-shmem
In reply to Thomas ZimmermannAdd an fbdev emulation for SHMEM-based memory managers. The code is similar to fbdev-generic, but does not require an additional shadow buffer for mmap(). Fbdev-shmem operates directly on the buffer object's SHMEM pages. Fbdev's deferred-I/O mechanism updates the hardware state on write operations.
The memory pages of GEM SHMEM cannot be detected by fbdefio. Therefore fbdev-shmem implements the .get_page() hook in struct fb_deferred_io. The fbdefio helpers call this hook to retrieve the page directly from fbdev-shmem instead of trying to detect it internally.
v3:
- clarify on get_page mechanism in commit description (Javier) v2:
- use drm_driver_legacy_fb_format() (Geert)
--- drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_fbdev_shmem.c | 316 ++++++++++++++++++++++++++++++ include/drm/drm_fbdev_shmem.h | 15 ++ 3 files changed, 332 insertions(+) create mode 100644 drivers/gpu/drm/drm_fbdev_shmem.c create mode 100644 include/drm/drm_fbdev_shmem.h
drivers/gpu/drm/Makefile +1 -0
@@ -107,6 +107,7 @@ drm_dma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_dma_helper.o obj-$(CONFIG_DRM_GEM_DMA_HELPER) += drm_dma_helper.o drm_shmem_helper-y := drm_gem_shmem_helper.o +drm_shmem_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fbdev_shmem.o obj-$(CONFIG_DRM_GEM_SHMEM_HELPER) += drm_shmem_helper.o drm_suballoc_helper-y := drm_suballoc.o
drivers/gpu/drm/drm_fbdev_shmem.c new file +316 -0
316 lines not on this page · raw message
include/drm/drm_fbdev_shmem.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT */ + +#ifndef DRM_FBDEV_SHMEM_H +#define DRM_FBDEV_SHMEM_H + +struct drm_device ; + +#ifdef CONFIG_DRM_FBDEV_EMULATION +void drm_fbdev_shmem_setup (struct drm_device *dev,unsigned int preferred_bpp); +#else +static inline void drm_fbdev_shmem_setup (struct drm_device *dev,unsigned int preferred_bpp) +{ } +#endif + +#endif
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 11/43 drm/hyperv: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/hyperv/hyperv_drm_drv.c +2 -2
@@ -11,7 +11,7 @@#include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_gem_shmem_helper.h> #include <drm/drm_simple_kms_helper.h>
@@ -149,7 +149,7 @@ static int hyperv_vmbus_probe(struct hv_device *hdev, goto err_free_mmio; } -drm_fbdev_generic_setup (dev,0 ); +drm_fbdev_shmem_setup (dev,0 );return 0 ;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 12/43 drm/mgag200: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/mgag200/mgag200_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/mgag200/mgag200_drv.c +2 -2
@@ -12,7 +12,7 @@#include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_file.h> #include <drm/drm_ioctl.h> #include <drm/drm_managed.h>
@@ -285,7 +285,7 @@ mgag200_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)* FIXME: A 24-bit color depth does not work with 24 bpp on * G200ER. Force 32 bpp. */ -drm_fbdev_generic_setup (dev,32 ); +drm_fbdev_shmem_setup (dev,32 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 13/43 drm/solomon: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/solomon/ssd130x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/solomon/ssd130x.c +2 -2
@@ -23,7 +23,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_damage_helper.h> #include <drm/drm_edid.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_format_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h>
@@ -2029,7 +2029,7 @@ struct ssd130x_device *ssd130x_probe(struct device *dev, struct regmap *regmap)if (ret)return ERR_PTR (dev_err_probe (dev, ret,"DRM device register failed\n" )); -drm_fbdev_generic_setup (drm,32 ); +drm_fbdev_shmem_setup (drm,32 );return ssd130x; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 14/43 drm/tiny/cirrus: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/cirrus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/cirrus.c +2 -2
@@ -31,7 +31,7 @@#include <drm/drm_damage_helper.h> #include <drm/drm_drv.h> #include <drm/drm_edid.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_file.h> #include <drm/drm_format_helper.h> #include <drm/drm_fourcc.h>
@@ -716,7 +716,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev,if (ret)return ret; -drm_fbdev_generic_setup (dev,16 ); +drm_fbdev_shmem_setup (dev,16 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 15/43 drm/tiny/gm12u320: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/gm12u320.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/gm12u320.c +2 -2
@@ -13,7 +13,7 @@#include <drm/drm_damage_helper.h> #include <drm/drm_drv.h> #include <drm/drm_edid.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_file.h> #include <drm/drm_format_helper.h> #include <drm/drm_fourcc.h>
@@ -699,7 +699,7 @@ static int gm12u320_usb_probe(struct usb_interface *interface,if (ret) goto err_put_device; -drm_fbdev_generic_setup (dev,0 ); +drm_fbdev_shmem_setup (dev,0 );return 0 ;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 16/43 drm/tiny/ofdrm: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/ofdrm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/ofdrm.c +2 -2
@@ -11,7 +11,7 @@#include <drm/drm_damage_helper.h> #include <drm/drm_device.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_format_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h>
@@ -1377,7 +1377,7 @@ static int ofdrm_probe(struct platform_device *pdev)if (color_mode ==16 ) color_mode = odev->format->depth;// can be 15 or 16 -drm_fbdev_generic_setup (dev, color_mode); +drm_fbdev_shmem_setup (dev, color_mode);return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 17/43 drm/tiny/simpledrm: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/simpledrm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/simpledrm.c +2 -2
@@ -17,7 +17,7 @@#include <drm/drm_damage_helper.h> #include <drm/drm_device.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_format_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h>
@@ -1026,7 +1026,7 @@ static int simpledrm_probe(struct platform_device *pdev)if (color_mode ==16 ) color_mode = sdev->format->depth;// can be 15 or 16 -drm_fbdev_generic_setup (dev, color_mode); +drm_fbdev_shmem_setup (dev, color_mode);return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 19/43 drm/virtio: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.c +2 -2
@@ -35,7 +35,7 @@#include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_file.h> #include "virtgpu_drv.h"
@@ -103,7 +103,7 @@ static int virtio_gpu_probe(struct virtio_device *vdev)if (ret) goto err_deinit; -drm_fbdev_generic_setup (vdev->priv,32 ); +drm_fbdev_shmem_setup (vdev->priv,32 );return 0 ; err_deinit:
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 18/43 drm/udl: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/udl/udl_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/udl/udl_drv.c +2 -2
@@ -6,7 +6,7 @@#include <linux/module.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_file.h> #include <drm/drm_gem_shmem_helper.h> #include <drm/drm_managed.h>
@@ -117,7 +117,7 @@ static int udl_usb_probe(struct usb_interface *interface,DRM_INFO ("Initialized udl on minor %d\n" , udl->drm.primary->index); -drm_fbdev_generic_setup (&udl->drm,0 ); +drm_fbdev_shmem_setup (&udl->drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 20/43 drm/vkms: Use fbdev-shmem
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-shmem. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/vkms/vkms_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.c +2 -2
@@ -17,7 +17,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_shmem.h> #include <drm/drm_file.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_ioctl.h>
@@ -223,7 +223,7 @@ static int vkms_create(struct vkms_config *config)if (ret) goto out_devres; -drm_fbdev_generic_setup (&vkms_device->drm,0 ); +drm_fbdev_shmem_setup (&vkms_device->drm,0 );return 0 ;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 21/43 drm/fbdev-dma: Implement damage handling and deferred I/O
In reply to Thomas ZimmermannAdd support for damage handling and deferred I/O to fbdev-dma. This enables fbdev-dma to support all DMA-memory-based DRM drivers, even such with a dirty callback in their framebuffers.
The patch adds the code for deferred I/O and also sets a dedicated helper for struct fb_ops.fb_mmap that support coherent mappings.
v3:
- init fb_ops with FB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS() (Javier)
--- drivers/gpu/drm/drm_fbdev_dma.c | 65 ++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 14 deletions(-)
drivers/gpu/drm/drm_fbdev_dma.c +51 -14
@@ -4,6 +4,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_drv.h> +#include <drm/drm_fb_dma_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_dma_helper.h>
@@ -35,6 +36,22 @@ static int drm_fbdev_dma_fb_release(struct fb_info *info, int user)return 0 ; } +FB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS (drm_fbdev_dma, + drm_fb_helper_damage_range, + drm_fb_helper_damage_area); + +static int drm_fbdev_dma_fb_mmap (struct fb_info *info,struct vm_area_struct *vma) +{ +struct drm_fb_helper *fb_helper = info->par; +struct drm_framebuffer *fb = fb_helper->fb; +struct drm_gem_dma_object *dma =drm_fb_dma_get_gem_obj (fb,0 ); + +if (!dma->map_noncoherent) + vma->vm_page_prot =pgprot_writecombine (vma->vm_page_prot); + +return fb_deferred_io_mmap (info, vma); +} +static void drm_fbdev_dma_fb_destroy (struct fb_info *info) {struct drm_fb_helper *fb_helper = info->par;
@@ -51,20 +68,13 @@ static void drm_fbdev_dma_fb_destroy(struct fb_info *info)kfree (fb_helper); } -static int drm_fbdev_dma_fb_mmap (struct fb_info *info,struct vm_area_struct *vma) -{ -struct drm_fb_helper *fb_helper = info->par; - -return drm_gem_prime_mmap (fb_helper->buffer->gem, vma); -} -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_DMAMEM_OPS_RDWR, +__FB_DEFAULT_DEFERRED_OPS_RDWR (drm_fbdev_dma),DRM_FB_HELPER_DEFAULT_OPS , - __FB_DEFAULT_DMAMEM_OPS_DRAW, +__FB_DEFAULT_DEFERRED_OPS_DRAW (drm_fbdev_dma), .fb_mmap = drm_fbdev_dma_fb_mmap, .fb_destroy = drm_fbdev_dma_fb_destroy, };
@@ -98,10 +108,6 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper, dma_obj =to_drm_gem_dma_obj (buffer->gem); fb = buffer->fb; -if (drm_WARN_ON (dev, fb->funcs->dirty)) { - ret = -ENODEV ;/* damage handling not supported; use generic emulation */ - goto err_drm_client_buffer_delete; - } ret =drm_client_buffer_vmap (buffer, &map);if (ret) {
@@ -112,7 +118,7 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper, } fb_helper->buffer = buffer; - fb_helper->fb = buffer->fb; + fb_helper->fb = fb; info =drm_fb_helper_alloc_info (fb_helper);if (IS_ERR (info)) {
@@ -133,8 +139,19 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper, info->fix.smem_start =page_to_phys (virt_to_page (info->screen_buffer)); info->fix.smem_len = info->screen_size; +/* deferred I/O */ + fb_helper->fbdefio.delay =HZ /20 ; + fb_helper->fbdefio.deferred_io = drm_fb_helper_deferred_io; + + info->fbdefio = &fb_helper->fbdefio; + ret =fb_deferred_io_init (info); +if (ret) + goto err_drm_fb_helper_release_info; +return 0 ; +err_drm_fb_helper_release_info: +drm_fb_helper_release_info (fb_helper); err_drm_client_buffer_vunmap: fb_helper->fb =NULL ; fb_helper->buffer =NULL ;
@@ -144,8 +161,28 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper,return ret; } +static int drm_fbdev_dma_helper_fb_dirty (struct drm_fb_helper *helper, +struct drm_clip_rect *clip) +{ +struct drm_device *dev = helper->dev; +int ret; + +/* Call damage handlers only if necessary */ +if (!(clip->x1 < clip->x2 && clip->y1 < clip->y2)) +return 0 ; + +if (helper->fb->funcs->dirty) { + ret = helper->fb->funcs->dirty (helper->fb,NULL ,0 ,0 , clip,1 ); +if (drm_WARN_ONCE (dev, ret,"Dirty helper failed: ret=%d\n" , ret)) +return ret; + } + +return 0 ; +} +static const struct drm_fb_helper_funcs drm_fbdev_dma_helper_funcs = { .fb_probe = drm_fbdev_dma_helper_fb_probe, + .fb_dirty = drm_fbdev_dma_helper_fb_dirty, };/*
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 22/43 drm/arm/komeda: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by komeda. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +2 -2
@@ -9,7 +9,7 @@#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_module.h> #include <drm/drm_of.h> #include "komeda_dev.h"
@@ -80,7 +80,7 @@ static int komeda_platform_probe(struct platform_device *pdev) }dev_set_drvdata (dev, mdrv); -drm_fbdev_generic_setup (&mdrv->kms->base,32 ); +drm_fbdev_dma_setup (&mdrv->kms->base,32 );return 0 ;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 23/43 drm/hisilicon/kirin: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by kirin. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +2 -2
@@ -19,7 +19,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_module.h>
@@ -237,7 +237,7 @@ static int kirin_drm_bind(struct device *dev)if (ret) goto err_kms_cleanup; -drm_fbdev_generic_setup (drm_dev,32 ); +drm_fbdev_dma_setup (drm_dev,32 );return 0 ;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 24/43 drm/imx/lcdc: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by lcdc. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/lcdc/imx-lcdc.c +2 -2
@@ -5,7 +5,7 @@#include <drm/drm_bridge_connector.h> #include <drm/drm_damage_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_fb_dma_helper.h> #include <drm/drm_fourcc.h> #include <drm/drm_framebuffer.h>
@@ -501,7 +501,7 @@ static int imx_lcdc_probe(struct platform_device *pdev)if (ret)return dev_err_probe (dev, ret,"Cannot register device\n" ); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 25/43 drm/ingenic: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by ingenic. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/ingenic/ingenic-drm-drv.c +2 -2
@@ -31,7 +31,7 @@#include <drm/drm_encoder.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_fb_dma_helper.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_fourcc.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h>
@@ -1399,7 +1399,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) goto err_clk_notifier_unregister; } -drm_fbdev_generic_setup (drm,32 ); +drm_fbdev_dma_setup (drm,32 );return 0 ;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 26/43 drm/mediatek: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by ingenic. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +2 -2
@@ -15,7 +15,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_fourcc.h> #include <drm/drm_gem.h> #include <drm/drm_gem_framebuffer_helper.h>
@@ -644,7 +644,7 @@ static int mtk_drm_bind(struct device *dev)if (ret <0 ) goto err_deinit; -drm_fbdev_generic_setup (drm,32 ); +drm_fbdev_dma_setup (drm,32 );return 0 ;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 27/43 drm/panel/panel-ilitek-9341: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by panel-ilitek-9341. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-ilitek-ili9341.c +2 -2
@@ -31,7 +31,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
@@ -650,7 +650,7 @@ static int ili9341_dbi_probe(struct spi_device *spi, struct gpio_desc *dc,spi_set_drvdata (spi, drm); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 28/43 drm/renesas/rcar-du: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by rcar-du. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c +2 -2
@@ -20,7 +20,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_managed.h> #include <drm/drm_probe_helper.h>
@@ -716,7 +716,7 @@ static int rcar_du_probe(struct platform_device *pdev)drm_info (&rcdu->ddev,"Device %s probed\n" ,dev_name (&pdev->dev)); -drm_fbdev_generic_setup (&rcdu->ddev,32 ); +drm_fbdev_dma_setup (&rcdu->ddev,32 );return 0 ;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 29/43 drm/renesas/rz-du: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by rz-du. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c +2 -2
@@ -14,7 +14,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_probe_helper.h>
@@ -149,7 +149,7 @@ static int rzg2l_du_probe(struct platform_device *pdev)drm_info (&rcdu->ddev,"Device %s probed\n" ,dev_name (&pdev->dev)); -drm_fbdev_generic_setup (&rcdu->ddev,32 ); +drm_fbdev_dma_setup (&rcdu->ddev,32 );return 0 ;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 30/43 drm/renesas/shmobile: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by shmobile. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +2 -2
@@ -19,7 +19,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_modeset_helper.h> #include <drm/drm_module.h>
@@ -250,7 +250,7 @@ static int shmob_drm_probe(struct platform_device *pdev)if (ret <0 ) goto err_modeset_cleanup; -drm_fbdev_generic_setup (ddev,16 ); +drm_fbdev_dma_setup (ddev,16 );return 0 ;
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 31/43 drm/rockchip: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by rockchip. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +2 -2
@@ -18,7 +18,7 @@#include <drm/drm_aperture.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h>
@@ -191,7 +191,7 @@ static int rockchip_drm_bind(struct device *dev)if (ret) goto err_kms_helper_poll_fini; -drm_fbdev_generic_setup (drm_dev,0 ); +drm_fbdev_dma_setup (drm_dev,0 );return 0 ; err_kms_helper_poll_fini:
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 32/43 drm/tiny/hx8357d: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by hx8357d. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/hx8357d.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/hx8357d.c +2 -2
@@ -18,7 +18,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_managed.h>
@@ -256,7 +256,7 @@ static int hx8357d_probe(struct spi_device *spi)spi_set_drvdata (spi, drm); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 33/43 drm/tiny/ili9163: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by ili9163. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/ili9163.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/ili9163.c +2 -2
@@ -9,7 +9,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_mipi_dbi.h>
@@ -185,7 +185,7 @@ static int ili9163_probe(struct spi_device *spi)if (ret)return ret; -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 34/43 drm/tiny/ili9225: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by ili9225. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/ili9225.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/ili9225.c +2 -2
@@ -20,7 +20,7 @@#include <drm/drm_damage_helper.h> #include <drm/drm_drv.h> #include <drm/drm_fb_dma_helper.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_fourcc.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h>
@@ -426,7 +426,7 @@ static int ili9225_probe(struct spi_device *spi)spi_set_drvdata (spi, drm); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 35/43 drm/tiny/ili9341: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by ili9341. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/ili9341.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/ili9341.c +2 -2
@@ -17,7 +17,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_managed.h>
@@ -218,7 +218,7 @@ static int ili9341_probe(struct spi_device *spi)spi_set_drvdata (spi, drm); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 36/43 drm/tiny/ili9486: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by ili9486. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/ili9486.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/ili9486.c +2 -2
@@ -16,7 +16,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_managed.h>
@@ -247,7 +247,7 @@ static int ili9486_probe(struct spi_device *spi)spi_set_drvdata (spi, drm); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 37/43 drm/tiny/mi0283qt: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by mi0283qt. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/mi0283qt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/mi0283qt.c +2 -2
@@ -15,7 +15,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_managed.h>
@@ -226,7 +226,7 @@ static int mi0283qt_probe(struct spi_device *spi)spi_set_drvdata (spi, drm); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 38/43 drm/tiny/panel-mipi-dbi: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by panel-mipi-dbi. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/panel-mipi-dbi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/panel-mipi-dbi.c +2 -2
@@ -16,7 +16,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_managed.h>
@@ -335,7 +335,7 @@ static int panel_mipi_dbi_spi_probe(struct spi_device *spi)spi_set_drvdata (spi, drm); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 39/43 drm/tiny/repaper: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by repaper. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/repaper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/repaper.c +2 -2
@@ -26,7 +26,7 @@#include <drm/drm_damage_helper.h> #include <drm/drm_drv.h> #include <drm/drm_fb_dma_helper.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_format_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h>
@@ -1118,7 +1118,7 @@ static int repaper_probe(struct spi_device *spi)DRM_DEBUG_DRIVER ("SPI speed: %uMHz\n" , spi->max_speed_hz /1000000 ); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 40/43 drm/tiny/st7586: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by st7586. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/st7586.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/st7586.c +2 -2
@@ -16,7 +16,7 @@#include <drm/drm_damage_helper.h> #include <drm/drm_drv.h> #include <drm/drm_fb_dma_helper.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_format_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h>
@@ -371,7 +371,7 @@ static int st7586_probe(struct spi_device *spi)spi_set_drvdata (spi, drm); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 41/43 drm/tiny/st7735r: Use fbdev-dma
In reply to Thomas ZimmermannImplement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by st7735r. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
--- drivers/gpu/drm/tiny/st7735r.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/st7735r.c +2 -2
@@ -18,7 +18,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_managed.h>
@@ -241,7 +241,7 @@ static int st7735r_probe(struct spi_device *spi)spi_set_drvdata (spi, drm); -drm_fbdev_generic_setup (drm,0 ); +drm_fbdev_dma_setup (drm,0 );return 0 ; }
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 42/43 drm/fbdev-generic: Convert to fbdev-ttm
In reply to Thomas ZimmermannOnly TTM-based drivers use fbdev-generic. Rename it to fbdev-ttm and change the symbol infix from _generic_ to _ttm_. Link the source file into TTM helpers, so that it is only build if TTM-based drivers have been selected. Select DRM_TTM_HELPER for loongson.
---
Documentation/gpu/drm-kms-helpers.rst | 2 +-
drivers/gpu/drm/Makefile | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +-
.../{drm_fbdev_generic.c => drm_fbdev_ttm.c} | 80 +++++++++----------
.../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +-
drivers/gpu/drm/loongson/Kconfig | 1 +
drivers/gpu/drm/loongson/lsdc_drv.c | 4 +-
drivers/gpu/drm/nouveau/nouveau_drm.c | 6 +-
drivers/gpu/drm/qxl/qxl_drv.c | 4 +-
drivers/gpu/drm/tiny/bochs.c | 4 +-
drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +-
include/drm/drm_fbdev_generic.h | 15 ----
include/drm/drm_fbdev_ttm.h | 15 ++++
14 files changed, 77 insertions(+), 77 deletions(-)
rename drivers/gpu/drm/{drm_fbdev_generic.c => drm_fbdev_ttm.c} (76%)
delete mode 100644 include/drm/drm_fbdev_generic.h
create mode 100644 include/drm/drm_fbdev_ttm.hDocumentation/gpu/drm-kms-helpers.rst +1 -1
@@ -116,7 +116,7 @@ fbdev Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_fb_helper.c :export: -.. kernel-doc:: drivers/gpu/drm/drm_fbdev_generic.c +.. kernel-doc:: drivers/gpu/drm/drm_fbdev_ttm.c :export: format Helper Functions Reference
drivers/gpu/drm/Makefile +2 -3
@@ -117,6 +117,7 @@ drm_vram_helper-y := drm_gem_vram_helper.o obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o drm_ttm_helper-y := drm_gem_ttm_helper.o +drm_ttm_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fbdev_ttm.o obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o #
@@ -142,9 +143,7 @@ drm_kms_helper-y := \ drm_self_refresh_helper.o \ drm_simple_kms_helper.o drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o -drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += \ - drm_fbdev_generic.o \ - drm_fb_helper.o +drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o #
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +3 -3
@@ -24,7 +24,7 @@#include <drm/amdgpu_drm.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_ttm.h> #include <drm/drm_gem.h> #include <drm/drm_managed.h> #include <drm/drm_pciids.h>
@@ -2318,9 +2318,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, !list_empty(&adev_to_drm(adev)->mode_config.connector_list)) {/* select 8 bpp console on low vram cards */ if (adev->gmc.real_vram_size <= (32 *1024 *1024 )) -drm_fbdev_generic_setup (adev_to_drm (adev),8 ); +drm_fbdev_ttm_setup (adev_to_drm (adev),8 );else -drm_fbdev_generic_setup (adev_to_drm (adev),32 ); +drm_fbdev_ttm_setup (adev_to_drm (adev),32 ); } ret =amdgpu_debugfs_init (adev);
drivers/gpu/drm/drm_fbdev_ttm.c renamed from drivers/gpu/drm/drm_fbdev_generic.c +40 -40
211 lines not on this page · raw message
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +2 -2
@@ -17,7 +17,7 @@#include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_ttm.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_vram_helper.h> #include <drm/drm_managed.h>
@@ -339,7 +339,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev, goto err_unload; } -drm_fbdev_generic_setup (dev,32 ); +drm_fbdev_ttm_setup (dev,32 );return 0 ;
drivers/gpu/drm/loongson/Kconfig +1 -0
@@ -6,6 +6,7 @@ config DRM_LOONGSON depends on LOONGARCH || MIPS || COMPILE_TEST select DRM_KMS_HELPER select DRM_TTM + select DRM_TTM_HELPER select I2C select I2C_ALGOBIT help
drivers/gpu/drm/loongson/lsdc_drv.c +2 -2
@@ -10,7 +10,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_ttm.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_modeset_helper.h>
@@ -314,7 +314,7 @@ static int lsdc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret)return ret; -drm_fbdev_generic_setup (ddev,32 ); +drm_fbdev_ttm_setup (ddev,32 );return 0 ; }
drivers/gpu/drm/nouveau/nouveau_drm.c +3 -3
@@ -32,7 +32,7 @@#include <drm/drm_aperture.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_ttm.h> #include <drm/drm_gem_ttm_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_vblank.h>
@@ -846,9 +846,9 @@ static int nouveau_drm_probe(struct pci_dev *pdev, goto fail_drm_dev_init;if (nouveau_drm (drm_dev)->client.device.info.ram_size <=32 *1024 *1024 ) -drm_fbdev_generic_setup (drm_dev,8 ); +drm_fbdev_ttm_setup (drm_dev,8 );else -drm_fbdev_generic_setup (drm_dev,32 ); +drm_fbdev_ttm_setup (drm_dev,32 );quirk_broken_nv_runpm (pdev);return 0 ;
drivers/gpu/drm/qxl/qxl_drv.c +2 -2
@@ -37,7 +37,7 @@#include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_ttm.h> #include <drm/drm_file.h> #include <drm/drm_gem_ttm_helper.h> #include <drm/drm_module.h>
@@ -118,7 +118,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto modeset_cleanup; -drm_fbdev_generic_setup (&qdev->ddev,32 ); +drm_fbdev_ttm_setup (&qdev->ddev,32 );return 0 ; modeset_cleanup:
drivers/gpu/drm/tiny/bochs.c +2 -2
@@ -7,7 +7,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> #include <drm/drm_edid.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_ttm.h> #include <drm/drm_fourcc.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_framebuffer_helper.h>
@@ -670,7 +670,7 @@ static int bochs_pci_probe(struct pci_dev *pdev, const struct pci_device_id *entif (ret) goto err_hw_fini; -drm_fbdev_generic_setup (dev,32 ); +drm_fbdev_ttm_setup (dev,32 );return ret; err_hw_fini:
drivers/gpu/drm/vboxvideo/vbox_drv.c +2 -2
@@ -14,7 +14,7 @@#include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_ttm.h> #include <drm/drm_file.h> #include <drm/drm_ioctl.h> #include <drm/drm_managed.h>
@@ -80,7 +80,7 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto err_irq_fini; -drm_fbdev_generic_setup (&vbox->ddev,32 ); +drm_fbdev_ttm_setup (&vbox->ddev,32 );return 0 ;
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +2 -2
@@ -36,7 +36,7 @@#include <drm/drm_aperture.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_ttm.h> #include <drm/drm_gem_ttm_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_module.h>
@@ -1680,7 +1680,7 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)vmw_fifo_resource_inc (vmw);vmw_svga_enable (vmw); -drm_fbdev_generic_setup (&vmw->drm,0 ); +drm_fbdev_ttm_setup (&vmw->drm,0 );vmw_debugfs_gem_init (vmw);vmw_debugfs_resource_managers_init (vmw);
include/drm/drm_fbdev_generic.h deleted +0 -15
@@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: MIT */ - -#ifndef DRM_FBDEV_GENERIC_H -#define DRM_FBDEV_GENERIC_H - -struct drm_device ; - -#ifdef CONFIG_DRM_FBDEV_EMULATION -void drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp); -#else -static inline void drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp) -{ } -#endif - -#endif
include/drm/drm_fbdev_ttm.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT */ + +#ifndef DRM_FBDEV_TTM_H +#define DRM_FBDEV_TTM_H + +struct drm_device ; + +#ifdef CONFIG_DRM_FBDEV_EMULATION +void drm_fbdev_ttm_setup (struct drm_device *dev,unsigned int preferred_bpp); +#else +static inline void drm_fbdev_ttm_setup (struct drm_device *dev,unsigned int preferred_bpp) +{ } +#endif + +#endif
Signature · 1 line
2.44.0
Thomas Zimmermann
maintainerPATCH v3 43/43 drm/fbdev: Clean up fbdev documentation
In reply to Thomas ZimmermannRewrite some docs that are not up-to-date any longer. Remove the TODO item for fbdev-generic conversion, as the helper has been replaced. Make documentation for DMA, SHMEM and TTM emulation available.
--- Documentation/gpu/drm-kms-helpers.rst | 12 +++++++++--- Documentation/gpu/todo.rst | 13 ------------- drivers/gpu/drm/drm_drv.c | 2 +- drivers/gpu/drm/drm_fb_helper.c | 11 ++--------- include/drm/drm_mode_config.h | 4 ++-- 5 files changed, 14 insertions(+), 28 deletions(-)
Documentation/gpu/drm-kms-helpers.rst +9 -3
@@ -110,15 +110,21 @@ fbdev Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_fb_helper.c :doc: fbdev helpers -.. kernel-doc:: include/drm/drm_fb_helper.h - :internal: +.. kernel-doc:: drivers/gpu/drm/drm_fbdev_dma.c + :export: -.. kernel-doc:: drivers/gpu/drm/drm_fb_helper.c +.. kernel-doc:: drivers/gpu/drm/drm_fbdev_shmem.c :export: .. kernel-doc:: drivers/gpu/drm/drm_fbdev_ttm.c :export: +.. kernel-doc:: include/drm/drm_fb_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_fb_helper.c + :export: + format Helper Functions Reference =================================
Documentation/gpu/todo.rst +0 -13
@@ -243,19 +243,6 @@ Contact: Maintainer of the driver you plan to convert Level: Intermediate -Convert drivers to use drm_fbdev_generic_setup() ------------------------------------------------- - -Most drivers can use drm_fbdev_generic_setup(). Driver have to implement -atomic modesetting and GEM vmap support. Historically, generic fbdev emulation -expected the framebuffer in system memory or system-like memory. By employing -struct iosys_map, drivers with frambuffers in I/O memory can be supported -as well. - -Contact: Maintainer of the driver you plan to convert - -Level: Intermediate - Reimplement functions in drm_fbdev_fb_ops without fbdev -------------------------------------------------------
drivers/gpu/drm/drm_drv.c +1 -1
@@ -345,7 +345,7 @@ void drm_minor_release(struct drm_minor *minor)* if (ret) * return ret; * -* drm_fbdev_generic_setup(drm, 32); +* drm_fbdev_{...}_setup(drm, 32); * * return 0; * }
drivers/gpu/drm/drm_fb_helper.c +2 -9
@@ -85,12 +85,8 @@ static DEFINE_MUTEX(kernel_fb_helper_lock);* The fb helper functions are useful to provide an fbdev on top of a drm kernel * mode setting driver. They can be used mostly independently from the crtc * helper functions used by many drivers to implement the kernel mode setting -* interfaces. -* -* Drivers that support a dumb buffer with a virtual address and mmap support, -* should try out the generic fbdev emulation using drm_fbdev_generic_setup(). -* It will automatically set up deferred I/O if the driver requires a shadow -* buffer. +* interfaces. Drivers that use one of the shared memory managers, TTM, SHMEM, +* DMA, should instead use the corresponding fbdev emulation. * * Existing fbdev implementations should restore the fbdev console by using * drm_fb_helper_lastclose() as their &drm_driver.lastclose callback.
@@ -126,9 +122,6 @@ static DEFINE_MUTEX(kernel_fb_helper_lock);* atomic context. If drm_fb_helper_deferred_io() is used as the deferred_io * callback it will also schedule dirty_work with the damage collected from the * mmap page writes. -* -* Deferred I/O is not compatible with SHMEM. Such drivers should request an -* fbdev shadow buffer and call drm_fbdev_generic_setup() instead. */ static void drm_fb_helper_restore_lut_atomic (struct drm_crtc *crtc)
include/drm/drm_mode_config.h +2 -2
@@ -106,8 +106,8 @@ struct drm_mode_config_funcs {* Drivers implementing fbdev emulation use drm_kms_helper_hotplug_event() * to call this hook to inform the fbdev helper of output changes. * -* This hook is deprecated, drivers should instead use -* drm_fbdev_generic_setup() which takes care of any necessary +* This hook is deprecated, drivers should instead implement fbdev +* support with struct drm_client, which takes care of any necessary * hotplug event forwarding already without further involvement by * the driver. */
Signature · 1 line
2.44.0
Re: [PATCH v3 28/43] drm/renesas/rcar-du: Use fbdev-dma
In reply to Thomas ZimmermannQuoting Thomas Zimmermann (2024-04-19 09:29:21)
Quoted 7 lines
Implement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by rcar-du. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
Signed-off-by Thomas Zimmermann <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Kieran Bingham <[email protected]>
As I'm on Cc, I'm fine with this too.
Quoted 30 lines
Reviewed-by Laurent Pinchart <[email protected]>--- drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c +2
-2@@ -20,7 +20,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> -#include <drm/drm_fbdev_generic.h> +#include <drm/drm_fbdev_dma.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_managed.h> #include <drm/drm_probe_helper.h> @@ -716,7 +716,7 @@ static int rcar_du_probe(struct platform_device *pdev)drm_info (&rcdu->ddev,"Device %s probed\n" ,dev_name (&pdev->dev)); -drm_fbdev_generic_setup (&rcdu->ddev,32 ); +drm_fbdev_dma_setup (&rcdu->ddev,32 );return 0 ;Signature · 1 line
2.44.0
Re: [PATCH v3 31/43] drm/rockchip: Use fbdev-dma
In reply to Thomas ZimmermannAm Freitag, 19. April 2024, 10:29:24 CEST schrieb Thomas Zimmermann:
Quoted 9 lines
Implement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by rockchip. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
Signed-off-by Thomas Zimmermann <[email protected]>Cc Sandy Huang <[email protected]>Cc "Heiko Stübner" <[email protected]>Cc Andy Yan <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>
Re: [PATCH v3 28/43] drm/renesas/rcar-du: Use fbdev-dma
In reply to Thomas ZimmermannHi Thomas,
Quoted 8 lines · Thomas Zimmermann
Implement fbdev emulation with fbdev-dma. Fbdev-dma now supports damage handling, which is required by rcar-du. Avoids the overhead of fbdev-generic's additional shadow buffering. No functional changes.
Signed-off-by Thomas Zimmermann <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Kieran Bingham <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>
Thanks for your patch, which is now commit b3fdbd60d35ce340 ("drm/renesas/rcar-du: Use fbdev-dma") in drm-misc/drm-misc-next.
Probably this doesn't come as a surprise, but with CONFIG_DEBUG_VIRTUAL=y, this triggers the following warning on R-Car Gen3/Gen4 (arm64), e.g. on White-Hawk:
virt_to_phys used for non-linear address: (____ptrval____)
(0xffffffc088001000)
WARNING: CPU: 0 PID: 44 at arch/arm64/mm/physaddr.c:12
__virt_to_phys+0x38/0x70
Modules linked in:
CPU: 0 PID: 44 Comm: kworker/u17:2 Not tainted
6.9.0-rc6-white-hawk-01422-gb3fdbd60d35c-dirty #283
Hardware name: Renesas White Hawk CPU and Breakout boards based on
r8a779g0 (DT)
Workqueue: events_unbound deferred_probe_work_func
pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : __virt_to_phys+0x38/0x70
lr : __virt_to_phys+0x38/0x70
sp : ffffffc08297b930
x29: ffffffc08297b930 x28: ffffff844527c000 x27: ffffffc080cb6a47
x26: ffffffc0810c0000 x25: ffffff84452a7800 x24: ffffff8445370018
x23: ffffff8443d34480 x22: ffffff8443d32c00 x21: ffffffc08297ba30
x20: ffffff84452a5800 x19: ffffffc088001000 x18: 0000000000000000
x17: 666678302820295f x16: 5f5f5f6c61767274 x15: 0720072007200720
x14: 0720072007200720 x13: 0720072007200720 x12: 0720072007200720
x11: 0000000000000180 x10: ffffffc0810e9aa0 x9 : ffffffc0813a9c80
x8 : ffffffc08297b638 x7 : ffffffc08297b640 x6 : 00000000ffff7fff
x5 : c0000000ffff7fff x4 : 0000000000000000 x3 : 0000000000000001
x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff8441ba2940
Call trace:
__virt_to_phys+0x38/0x70
drm_fbdev_dma_helper_fb_probe+0x178/0x1e8
__drm_fb_helper_initial_config_and_unlock+0x26c/0x4b8
drm_fb_helper_initial_config+0x30/0x44
drm_fbdev_dma_client_hotplug+0x84/0xb4
drm_client_register+0x74/0xb8
drm_fbdev_dma_setup+0x118/0x11c
rcar_du_probe+0x160/0x174
platform_probe+0x64/0xb0
really_probe+0x130/0x260
__driver_probe_device+0xec/0x104
driver_probe_device+0x4c/0xf8
__device_attach_driver+0xa8/0xc8
bus_for_each_drv+0xa4/0xc8
__device_attach+0xe4/0x144
device_initial_probe+0x10/0x18
bus_probe_device+0x38/0xa0
deferred_probe_work_func+0xb8/0xd0
process_scheduled_works+0x314/0x4d4
worker_thread+0x1b8/0x20c
kthread+0xd8/0xe8
ret_from_fork+0x10/0x20
irq event stamp: 7568
hardirqs last enabled at (7567): [<ffffffc080928828>]
_raw_spin_unlock_irq+0x2c/0x40
hardirqs last disabled at (7568): [<ffffffc080922b20>]
__schedule+0x1cc/0x868
softirqs last enabled at (5004): [<ffffffc0800102fc>]
__do_softirq+0x1ac/0x3a8
softirqs last disabled at (4999): [<ffffffc080015624>]
____do_softirq+0xc/0x14Interestingly, the warning is not triggered on R-Car Gen2 (arm32), although arch/arm/mm/physaddr.c has a similar check.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH v3 21/43] drm/fbdev-dma: Implement damage handling and deferred I/O
In reply to Thomas ZimmermannQuoted 4 lines · Thomas Zimmermann
Add support for damage handling and deferred I/O to fbdev-dma. This enables fbdev-dma to support all DMA-memory-based DRM drivers, even such with a dirty callback in their framebuffers.
Quoted 8 lines
The patch adds the code for deferred I/O and also sets a dedicated helper for struct fb_ops.fb_mmap that support coherent mappings.
v3:
- initfb_opswithFB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS()(Javier)Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>
For some reason this makes the Versatile Express crash in QEMU (I can retest on real hardware if necessary):
8<--- cut here ---
Unable to handle kernel paging request at virtual address 18095000 when write [18095000] *pgd=00000000 Internal error: Oops: 805 [#1] SMP ARM CPU: 0 PID: 75 Comm: S08_ledflash Not tainted 6.9.0-rc6+ #44 Hardware name: ARM-Versatile Express PC is at mmioset+0x34/0xac LR is at 0x0 pc : [<809c2a54>] lr : [<00000000>] psr: 20000013
sp : f8dddc38 ip : 18095000 fp : 00000000
r10: 81109a18 r9 : 81238b04 r8 : 00000000
r7 : 00440dc0 r6 : ed4f32a0 r5 : ed4f32a0 r4 : 00000001 r3 : 00000000 r2 : 00000fc0 r1 : 00000000 r0 : 18095000
Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none
Control: 10c5387d Table: 81d6406a DAC: 00000051 Register r0 information: non-paged memory
Register r1 information: NULL pointer
Register r2 information: non-paged memory
Register r3 information: NULL pointer
Register r4 information: non-paged memory
Register r5 information: non-slab/vmalloc memory Register r6 information: non-slab/vmalloc memory Register r7 information: non-paged memory
Register r8 information: NULL pointer
Register r9 information: non-slab/vmalloc memory Register r10 information: non-slab/vmalloc memory Register r11 information: NULL pointer
Register r12 information: non-paged memory
Process S08_ledflash (pid: 75, stack limit = 0x(ptrval))
Stack: (0xf8dddc38 to 0xf8dde000)
dc20: 00000801 802af888
dc40: 80a0fb80 00440dc0 00000801 811fad80 00000000 f8dddd28 ed4f32a0 811fa680
dc60: 00000000 802b0c30 ee1d2140 ee1d215c 95ff4385 00000001 00000001 00000001
dc80: 00000000 00000000 ffffffff 8196a70b 000000b0 00000064 0000006c 00000000
dca0: 00000001 00000002 00000001 811fa798 00000801 811fa940 80a0fb80 00000cc0
dcc0: 00000001 00000001 00000000 f8dddd28 811fa93c 811fa680 00000002 802b0c30
dce0: ee1d2140 00440dc0 00000000 00000000 00000001 00000000 811fad80 00440dc0
dd00: 00000001 00000000 00000000 83201100 00440dc0 00000000 00000000 802afa18
dd20: 00000bdc 00000bd8 811fad80 00000000 811fad80 00000000 00000000 00000000
dd40: adf00ec5 816d5fa8 816d5fa8 821c3c00 00000000 7ebc2000 7ebe3000 00000000
dd60: f8ddde44 8028cfa0 816d5fa8 8288df50 8169cf00 821c3c00 7ebc2000 7ebe3000
dd80: f8ddde44 8028e1e8 00000001 80bbe932 f8ddde44 f8dddde8 f8ddde44 8288df50
dda0: 83201100 809cf474 f8ddde44 8169cf00 00000020 8169cf94 821c3c94 7ebe3000
ddc0: 7ebe2fff fffffff4 00000000 816d5fa8 821c3c00 8169cf00 81d65fa8 809cdbb0
dde0: 8288df50 81ffa910 7ebe3000 82890b00 00000000 00000000 00000000 00000000
de00: 00000000 00000000 adf00ec5 00000000 00000000 8169cf00 8288df50 83201100
de20: 821c3c00 81ffa910 f8ddde44 8011f6e4 00000000 00000000 821c3c7c 8169cf7c
de40: 83200880 821c3c40 7ebc2000 7ebe2fff 82890b0c 76ea4000 ffffffff 00000000
de60: 00000000 0f000a01 f8ddde68 f8ddde68 adf00ec5 00000000 00000000 00000000
de80: 00000000 01200000 83201100 00000000 00000000 8011e2ac 00000000 83200d7c
dea0: 83201020 83200e70 83200e80 00000000 f8dddf30 83200880 00000000 00000000
dec0: 00000000 00000000 00000000 82182f38 adf00ec5 00000000 01200000 f8dddf30
dee0: 00000000 00000000 00000000 00000078 000cb21c 8011fe24 00000020 00000000
df00: 828a5d80 80a10140 adf00ec5 01200011 00000000 00000000 00000000 f8dddf30
df20: 00000000 00000078 000cb21c 801203d4 01200000 00000000 00000000 76f46468
df40: 00000000 00000000 00000011 00000000 00000000 00000000 00000000 00000000
df60: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
df80: 00000003 adf00ec5 76f46468 00000000 76f468c0 00000078 80100290 83201100
dfa0: 000cb21c 80100060 76f46468 00000000 01200011 00000000 00000000 00000000
dfc0: 76f46468 00000000 76f468c0 00000078 00000000 76e81000 76f46400 000cb21c
dfe0: 00000078 7ebe2938 76e0854d 76dae7e6 20000030 01200011 00000000 00000000
Call trace: mmioset from prep_new_page+0x160/0x194 prep_new_page from get_page_from_freelist+0x10f4/0x110c get_page_from_freelist from __alloc_pages+0x15c/0x280 __alloc_pages from __pte_alloc+0x28/0x1bc __pte_alloc from copy_page_range+0xc10/0xd28 copy_page_range from copy_mm+0x5cc/0x850 copy_mm from copy_process+0x508/0xd8c copy_process from kernel_clone+0x94/0x338 kernel_clone from sys_clone+0x94/0xb0 sys_clone from ret_fast_syscall+0x0/0x1c Exception stack(0xf8dddfa8 to 0xf8dddff0) dfa0: 76f46468 00000000 01200011 00000000 00000000 00000000 dfc0: 76f46468 00000000 76f468c0 00000078 00000000 76e81000 76f46400 000cb21c dfe0: 00000078 7ebe2938 76e0854d 76dae7e6 Code: e92d4100 e1a08001 e1a0e003 e2522040 (a8ac410a) ---[ end trace 0000000000000000 ]---
I bisected down to this commit and reverting the commit solves the issue.
What is special about the Versatile Express graphics is that it uses a special dedicated video RAM, looks like this in the device tree
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
/* Chipselect 3 is physically at 0x4c000000 */
vram: vram@4c000000 {
/* 8 MB of designated video RAM */
compatible = "shared-dma-pool";
reg = <0x4c000000 0x00800000>;
no-map;
};
};
(...)
clcd@1f000 {
compatible = "arm,pl111", "arm,primecell";
(...)
memory-region = <&vram>;This gets picked up in the driverdrivers/gpu/drm/pl111/pl111_drv.c
like this:
ret = of_reserved_mem_device_init(dev);
if (!ret) {
dev_info(dev, "using device-specific reserved memory\n");
priv->use_device_memory = true;
}Yours,
Linus Walleij
Re: [PATCH v3 21/43] drm/fbdev-dma: Implement damage handling and deferred I/O
Hi Linus,
Am Mittwoch, 4. September 2024, 00:53:42 CEST schrieb Linus Walleij:
Quoted 9 lines · Thomas Zimmermann
Quoted 8 lines
Add support for damage handling and deferred I/O to fbdev-dma. This enables fbdev-dma to support all DMA-memory-based DRM drivers, even such with a dirty callback in their framebuffers.
The patch adds the code for deferred I/O and also sets a dedicated helper for struct fb_ops.fb_mmap that support coherent mappings.
Quoted 8 lines
Quoted 5 lines
v3:
- initfb_opswithFB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS()(Javier)Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>For some reason this makes the Versatile Express crash in QEMU (I can retest on real hardware if necessary):
This commit also breaks i.MX6 on actual hardware, see [1].
[1] https://lore.kernel.org/all/23636953.6Emhk5qWAg@steina-w/
Quoted 85 lines
8<--- cut here ---
Unable to handle kernel paging request at virtual address 18095000 when write [18095000] *pgd=00000000 Internal error: Oops: 805 [#1] SMP ARM CPU: 0 PID: 75 Comm: S08_ledflash Not tainted 6.9.0-rc6+ #44 Hardware name: ARM-Versatile Express PC is at mmioset+0x34/0xac LR is at 0x0 pc : [<809c2a54>] lr : [<00000000>] psr: 20000013sp :
f8dddc38ip : 18095000 fp : 00000000
r10:81109a18r9 :81238b04r8 : 00000000
r7 :00440dc0r6 :ed4f32a0r5 :ed4f32a0r4 : 00000001 r3 : 00000000 r2 :00000fc0r1 : 00000000 r0 : 18095000
Flags: nzCv IRQs on FIQs on ModeSVC_32ISA ARM Segment none
Control:10c5387dTable:81d6406aDAC: 00000051 Register r0 information: non-paged memory
Register r1 information: NULL pointer
Register r2 information: non-paged memory
Register r3 information: NULL pointer
Register r4 information: non-paged memory
Register r5 information: non-slab/vmalloc memory Register r6 information: non-slab/vmalloc memory Register r7 information: non-paged memory
Register r8 information: NULL pointer
Register r9 information: non-slab/vmalloc memory Register r10 information: non-slab/vmalloc memory Register r11 information: NULL pointer
Register r12 information: non-paged memory
ProcessS08_ledflash(pid: 75, stack limit = 0x(ptrval))Stack: (0xf8dddc38 to 0xf8dde000)dc20: 00000801
802af888
dc40:80a0fb8000440dc000000801811fad8000000000f8dddd28ed4f32a0811fa680
dc60: 00000000802b0c30ee1d2140ee1d215c95ff438500000001 00000001 00000001
dc80: 00000000 00000000 ffffffff8196a70b000000b0000000640000006c00000000
dca0: 00000001 00000002 00000001811fa79800000801811fa94080a0fb8000000cc0
dcc0: 00000001 00000001 00000000f8dddd28811fa93c811fa68000000002802b0c30
dce0:ee1d214000440dc000000000 00000000 00000001 00000000811fad8000440dc0
dd00: 00000001 00000000 00000000 8320110000440dc000000000 00000000802afa18
dd20:00000bdc00000bd8811fad8000000000811fad8000000000 00000000 00000000
dd40:adf00ec5816d5fa8816d5fa8821c3c00000000007ebc20007ebe300000000000
dd60:f8ddde448028cfa0816d5fa88288df508169cf00821c3c007ebc20007ebe3000
dd80:f8ddde448028e1e80000000180bbe932f8ddde44f8dddde8f8ddde448288df50
dda0: 83201100809cf474f8ddde448169cf00000000208169cf94821c3c947ebe3000
ddc0:7ebe2ffffffffff400000000816d5fa8821c3c008169cf0081d65fa8809cdbb0
dde0:8288df5081ffa9107ebe300082890b0000000000 00000000 00000000 00000000
de00: 00000000 00000000adf00ec500000000 000000008169cf008288df5083201100
de20:821c3c0081ffa910f8ddde448011f6e400000000 00000000821c3c7c8169cf7c
de40: 83200880821c3c407ebc20007ebe2fff82890b0c76ea4000ffffffff 00000000
de60: 000000000f000a01f8ddde68f8ddde68adf00ec500000000 00000000 00000000
de80: 00000000 01200000 83201100 00000000 000000008011e2ac0000000083200d7c
dea0: 8320102083200e7083200e8000000000f8dddf3083200880 00000000 00000000
dec0: 00000000 00000000 0000000082182f38adf00ec500000000 01200000f8dddf30
dee0: 00000000 00000000 00000000 00000078000cb21c8011fe2400000020 00000000
df00:828a5d8080a10140adf00ec501200011 00000000 00000000 00000000f8dddf30
df20: 00000000 00000078000cb21c801203d401200000 00000000 0000000076f46468
df40: 00000000 00000000 00000011 00000000 00000000 00000000 00000000 00000000
df60: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
df80: 00000003adf00ec576f464680000000076f468c000000078 80100290 83201100
dfa0:000cb21c8010006076f4646800000000 01200011 00000000 00000000 00000000
dfc0:76f464680000000076f468c000000078 0000000076e8100076f46400000cb21c
dfe0: 000000787ebe293876e0854d76dae7e620000030 01200011 00000000 00000000Call trace: mmioset from prep_new_page+0x160/0x194 prep_new_page from get_page_from_freelist+0x10f4/0x110c get_page_from_freelist from __alloc_pages+0x15c/0x280 __alloc_pages from __pte_alloc+0x28/0x1bc __pte_alloc from copy_page_range+0xc10/0xd28 copy_page_range from copy_mm+0x5cc/0x850 copy_mm from copy_process+0x508/0xd8c copy_process from kernel_clone+0x94/0x338 kernel_clone from sys_clone+0x94/0xb0 sys_clone from ret_fast_syscall+0x0/0x1c Exception stack(0xf8dddfa8 to 0xf8dddff0) dfa0: 76f46468 00000000 01200011 00000000 00000000 00000000 dfc0: 76f46468 00000000 76f468c0 00000078 00000000 76e81000 76f46400 000cb21c dfe0: 00000078 7ebe2938 76e0854d 76dae7e6 Code: e92d4100 e1a08001 e1a0e003 e2522040 (a8ac410a) ---[ end trace 0000000000000000 ]---I bisected down to this commit and reverting the commit solves the issue.
What is special about the Versatile Express graphics is that it uses a special dedicated video RAM, looks like this in the device tree
Quoted 10 lines
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
/* Chipselect 3 is physically at 0x4c000000 */
vram: vram@4c000000 {
/* 8 MB of designated video RAM */
compatible = "shared-dma-pool";
reg = <0x4c000000 0x00800000>;Can you please check in which memory zone this VRAM is located. In my case it's important CMA is located in Normal zone to trigger this problem.
Best regards,
Alexander
Quoted 22 lines
no-map; }; }; (...) clcd@1f000 { compatible = "arm,pl111", "arm,primecell"; (...) memory-region = <&vram>;This gets picked up in the driver
drivers/gpu/drm/pl111/pl111_drv.c
like this:ret = of_reserved_mem_device_init(dev); if (!ret) { dev_info(dev, "using device-specific reserved memory\n"); priv->use_device_memory = true; }Yours,
Linus Walleij
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
Re: [PATCH v3 21/43] drm/fbdev-dma: Implement damage handling and deferred I/O
Quoted 2 lines · Alexander Stein
Can you please check in which memory zone this VRAM is located. In my case it's important CMA is located in Normal zone to trigger this problem.
dmesg says this:
Reserved memory: created DMA memory pool at 0x18000000, size 8 MiB
OF: reserved mem: initialized node vram@18000000, compatible id shared-dma-pool
OF: reserved mem: 0x18000000..0x187fffff (8192 KiB) nomap non-reusable vram@18000000
cma: Reserved 16 MiB at 0xef000000 on node -1
Zone ranges:
Normal [mem 0x0000000080000000-0x00000000efffffff]
Movable zone start for each node
Early memory node ranges
node 0: [mem 0x0000000080000000-0x00000000efffffff]
Initmem setup node 0 [mem 0x0000000080000000-0x00000000efffffff]
percpu: Embedded 15 pages/cpu s39052 r0 d22388 u61440
So at the top of the normal zone at 0xef000000 as I read it.
Yours,
Linus Walleij
Re: [PATCH v3 21/43] drm/fbdev-dma: Implement damage handling and deferred I/O
Hi Linus,
Am Mittwoch, 4. September 2024, 08:36:46 CEST schrieb Linus Walleij:
Quoted 21 lines
Quoted 2 lines · Alexander Stein
Can you please check in which memory zone this VRAM is located. In my case it's important CMA is located in Normal zone to trigger this problem.
dmesg says this:
Reserved memory: created DMA memory pool at
0x18000000, size 8 MiB
OF: reserved mem: initialized node vram@18000000, compatible id shared-dma-pool
OF: reserved mem: 0x18000000..0x187fffff (8192 KiB) nomap non-reusable vram@18000000
cma: Reserved 16 MiB at0xef000000on node -1
Zone ranges:
Normal [mem 0x0000000080000000-0x00000000efffffff]
Movable zone start for each node
Early memory node ranges
node 0: [mem 0x0000000080000000-0x00000000efffffff]
Initmem setup node 0 [mem 0x0000000080000000-0x00000000efffffff]
percpu: Embedded 15 pages/cpu s39052 r0 d22388 u61440
Quoted 1 line
So at the top of the normal zone at
0xef000000as I read it.
Okay, so it is the same as for me. It seems you don't have any HighMem. On a different model having more memory there is also HighMem available:
[ 0.000000] Zone ranges: [ 0.000000] Normal [mem 0x0000000010000000-0x000000003fffffff] [ 0.000000] HighMem [mem 0x0000000040000000-0x000000004fffffff]
If I explicitly configure CMA in HighMem I don't have any issues. But the 512MiB models don't have enough memory for fixed allocation in HighMem.
I was about to send a revert myself as I didn't get any feedback yet.
Best regards,
Alexander
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
Thomas Zimmermann
maintainerRe: [PATCH v3 21/43] drm/fbdev-dma: Implement damage handling and deferred I/O
In reply to Linus WalleijHi Linus
Am 04.09.24 um 00:53 schrieb Linus Walleij:
Quoted 96 lines · Thomas Zimmermann
Quoted 5 lines
Add support for damage handling and deferred I/O to fbdev-dma. This enables fbdev-dma to support all DMA-memory-based DRM drivers, even such with a dirty callback in their framebuffers.
Quoted 8 lines
The patch adds the code for deferred I/O and also sets a dedicated helper for struct fb_ops.fb_mmap that support coherent mappings.
v3:
- initfb_opswithFB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS()(Javier)Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>For some reason this makes the Versatile Express crash in QEMU (I can retest on real hardware if necessary):
8<--- cut here ---
Unable to handle kernel paging request at virtual address 18095000 when write [18095000] *pgd=00000000 Internal error: Oops: 805 [#1] SMP ARM CPU: 0 PID: 75 Comm: S08_ledflash Not tainted 6.9.0-rc6+ #44 Hardware name: ARM-Versatile Express PC is at mmioset+0x34/0xac LR is at 0x0 pc : [<809c2a54>] lr : [<00000000>] psr: 20000013sp :
f8dddc38ip : 18095000 fp : 00000000
r10:81109a18r9 :81238b04r8 : 00000000
r7 :00440dc0r6 :ed4f32a0r5 :ed4f32a0r4 : 00000001 r3 : 00000000 r2 :00000fc0r1 : 00000000 r0 : 18095000
Flags: nzCv IRQs on FIQs on ModeSVC_32ISA ARM Segment none
Control:10c5387dTable:81d6406aDAC: 00000051 Register r0 information: non-paged memory
Register r1 information: NULL pointer
Register r2 information: non-paged memory
Register r3 information: NULL pointer
Register r4 information: non-paged memory
Register r5 information: non-slab/vmalloc memory Register r6 information: non-slab/vmalloc memory Register r7 information: non-paged memory
Register r8 information: NULL pointer
Register r9 information: non-slab/vmalloc memory Register r10 information: non-slab/vmalloc memory Register r11 information: NULL pointer
Register r12 information: non-paged memory
ProcessS08_ledflash(pid: 75, stack limit = 0x(ptrval))Stack: (0xf8dddc38 to 0xf8dde000)dc20: 00000801
802af888
dc40:80a0fb8000440dc000000801811fad8000000000f8dddd28ed4f32a0811fa680
dc60: 00000000802b0c30ee1d2140ee1d215c95ff438500000001 00000001 00000001
dc80: 00000000 00000000 ffffffff8196a70b000000b0000000640000006c00000000
dca0: 00000001 00000002 00000001811fa79800000801811fa94080a0fb8000000cc0
dcc0: 00000001 00000001 00000000f8dddd28811fa93c811fa68000000002802b0c30
dce0:ee1d214000440dc000000000 00000000 00000001 00000000811fad8000440dc0
dd00: 00000001 00000000 00000000 8320110000440dc000000000 00000000802afa18
dd20:00000bdc00000bd8811fad8000000000811fad8000000000 00000000 00000000
dd40:adf00ec5816d5fa8816d5fa8821c3c00000000007ebc20007ebe300000000000
dd60:f8ddde448028cfa0816d5fa88288df508169cf00821c3c007ebc20007ebe3000
dd80:f8ddde448028e1e80000000180bbe932f8ddde44f8dddde8f8ddde448288df50
dda0: 83201100809cf474f8ddde448169cf00000000208169cf94821c3c947ebe3000
ddc0:7ebe2ffffffffff400000000816d5fa8821c3c008169cf0081d65fa8809cdbb0
dde0:8288df5081ffa9107ebe300082890b0000000000 00000000 00000000 00000000
de00: 00000000 00000000adf00ec500000000 000000008169cf008288df5083201100
de20:821c3c0081ffa910f8ddde448011f6e400000000 00000000821c3c7c8169cf7c
de40: 83200880821c3c407ebc20007ebe2fff82890b0c76ea4000ffffffff 00000000
de60: 000000000f000a01f8ddde68f8ddde68adf00ec500000000 00000000 00000000
de80: 00000000 01200000 83201100 00000000 000000008011e2ac0000000083200d7c
dea0: 8320102083200e7083200e8000000000f8dddf3083200880 00000000 00000000
dec0: 00000000 00000000 0000000082182f38adf00ec500000000 01200000f8dddf30
dee0: 00000000 00000000 00000000 00000078000cb21c8011fe2400000020 00000000
df00:828a5d8080a10140adf00ec501200011 00000000 00000000 00000000f8dddf30
df20: 00000000 00000078000cb21c801203d401200000 00000000 0000000076f46468
df40: 00000000 00000000 00000011 00000000 00000000 00000000 00000000 00000000
df60: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
df80: 00000003adf00ec576f464680000000076f468c000000078 80100290 83201100
dfa0:000cb21c8010006076f4646800000000 01200011 00000000 00000000 00000000
dfc0:76f464680000000076f468c000000078 0000000076e8100076f46400000cb21c
dfe0: 000000787ebe293876e0854d76dae7e620000030 01200011 00000000 00000000Call trace: mmioset from prep_new_page+0x160/0x194 prep_new_page from get_page_from_freelist+0x10f4/0x110c get_page_from_freelist from __alloc_pages+0x15c/0x280 __alloc_pages from __pte_alloc+0x28/0x1bc __pte_alloc from copy_page_range+0xc10/0xd28 copy_page_range from copy_mm+0x5cc/0x850 copy_mm from copy_process+0x508/0xd8c copy_process from kernel_clone+0x94/0x338 kernel_clone from sys_clone+0x94/0xb0 sys_clone from ret_fast_syscall+0x0/0x1c Exception stack(0xf8dddfa8 to 0xf8dddff0) dfa0: 76f46468 00000000 01200011 00000000 00000000 00000000 dfc0: 76f46468 00000000 76f468c0 00000078 00000000 76e81000 76f46400 000cb21c dfe0: 00000078 7ebe2938 76e0854d 76dae7e6 Code: e92d4100 e1a08001 e1a0e003 e2522040 (a8ac410a) ---[ end trace 0000000000000000 ]---
Quoted 1 line
I bisected down to this commit and reverting the commit solves the issue.
Thanks for bisecting. Simply reverting isn't an option as that would break many other drivers.
Is it only the pl111 driver? If nothing else works, we could give it a dedicated fbdev emulation.
Best regards
Thomas
Quoted 36 lines
What is special about the Versatile Express graphics is that it uses a special dedicated video RAM, looks like this in the device tree
reserved-memory { #address-cells = <1>; #size-cells = <1>; ranges; /* Chipselect 3 is physically at 0x4c000000 */ vram: vram@4c000000 { /* 8 MB of designated video RAM */ compatible = "shared-dma-pool"; reg = <0x4c000000 0x00800000>; no-map; }; }; (...) clcd@1f000 { compatible = "arm,pl111", "arm,primecell"; (...) memory-region = <&vram>;This gets picked up in the driver
drivers/gpu/drm/pl111/pl111_drv.c
like this:ret = of_reserved_mem_device_init(dev); if (!ret) { dev_info(dev, "using device-specific reserved memory\n"); priv->use_device_memory = true; }Yours,
Linus Walleij
Signature · 7 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: [PATCH v3 21/43] drm/fbdev-dma: Implement damage handling and deferred I/O
In reply to Alexander SteinHi
Am 04.09.24 um 08:43 schrieb Alexander Stein:
Quoted 23 lines
Hi Linus,
Am Mittwoch, 4. September 2024, 08:36:46 CEST schrieb Linus Walleij:
Quoted 20 lines
Quoted 2 lines · Alexander Stein
Can you please check in which memory zone this VRAM is located. In my case it's important CMA is located in Normal zone to trigger this problem.
dmesg says this:
Reserved memory: created DMA memory pool at
0x18000000, size 8 MiB
OF: reserved mem: initialized node vram@18000000, compatible id shared-dma-pool
OF: reserved mem: 0x18000000..0x187fffff (8192 KiB) nomap non-reusable vram@18000000
cma: Reserved 16 MiB at0xef000000on node -1
Zone ranges:Normal [mem 0x0000000080000000-0x00000000efffffff]Movable zone start for each node
Early memory node ranges
node 0: [mem 0x0000000080000000-0x00000000efffffff]
Initmem setup node 0 [mem 0x0000000080000000-0x00000000efffffff]
percpu: Embedded 15 pages/cpu s39052 r0 d22388 u61440
Quoted 7 lines
Quoted 1 line
So at the top of the normal zone at
0xef000000as I read it.Okay, so it is the same as for me. It seems you don't have any HighMem. On a different model having more memory there is also HighMem available:
[ 0.000000] Zone ranges: [ 0.000000] Normal [mem 0x0000000010000000-0x000000003fffffff] [ 0.000000] HighMem [mem 0x0000000040000000-0x000000004fffffff]
IIRC vram needs to be located in HighMem for the code to work. What is the difference between these zones?
Best regards
Thomas
Quoted 8 lines
If I explicitly configure CMA in HighMem I don't have any issues. But the 512MiB models don't have enough memory for fixed allocation in HighMem.
I was about to send a revert myself as I didn't get any feedback yet.
Best regards,
Alexander
Signature · 7 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: [PATCH v3 21/43] drm/fbdev-dma: Implement damage handling and deferred I/O
In reply to Linus WalleijHi Linus, Alexander,
Attached is a patch to mitigate the problem and go back to the old behavior for pl111. Can you please test it on affected and unaffected systems and report the results?
Best regards
Thomas
Am 04.09.24 um 00:53 schrieb Linus Walleij:
Quoted 133 lines · Thomas Zimmermann
Quoted 5 lines
Add support for damage handling and deferred I/O to fbdev-dma. This enables fbdev-dma to support all DMA-memory-based DRM drivers, even such with a dirty callback in their framebuffers.
Quoted 8 lines
The patch adds the code for deferred I/O and also sets a dedicated helper for struct fb_ops.fb_mmap that support coherent mappings.
v3:
- initfb_opswithFB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS()(Javier)Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>For some reason this makes the Versatile Express crash in QEMU (I can retest on real hardware if necessary):
8<--- cut here ---
Unable to handle kernel paging request at virtual address 18095000 when write [18095000] *pgd=00000000 Internal error: Oops: 805 [#1] SMP ARM CPU: 0 PID: 75 Comm: S08_ledflash Not tainted 6.9.0-rc6+ #44 Hardware name: ARM-Versatile Express PC is at mmioset+0x34/0xac LR is at 0x0 pc : [<809c2a54>] lr : [<00000000>] psr: 20000013sp :
f8dddc38ip : 18095000 fp : 00000000
r10:81109a18r9 :81238b04r8 : 00000000
r7 :00440dc0r6 :ed4f32a0r5 :ed4f32a0r4 : 00000001 r3 : 00000000 r2 :00000fc0r1 : 00000000 r0 : 18095000
Flags: nzCv IRQs on FIQs on ModeSVC_32ISA ARM Segment none
Control:10c5387dTable:81d6406aDAC: 00000051 Register r0 information: non-paged memory
Register r1 information: NULL pointer
Register r2 information: non-paged memory
Register r3 information: NULL pointer
Register r4 information: non-paged memory
Register r5 information: non-slab/vmalloc memory Register r6 information: non-slab/vmalloc memory Register r7 information: non-paged memory
Register r8 information: NULL pointer
Register r9 information: non-slab/vmalloc memory Register r10 information: non-slab/vmalloc memory Register r11 information: NULL pointer
Register r12 information: non-paged memory
ProcessS08_ledflash(pid: 75, stack limit = 0x(ptrval))Stack: (0xf8dddc38 to 0xf8dde000)dc20: 00000801
802af888
dc40:80a0fb8000440dc000000801811fad8000000000f8dddd28ed4f32a0811fa680
dc60: 00000000802b0c30ee1d2140ee1d215c95ff438500000001 00000001 00000001
dc80: 00000000 00000000 ffffffff8196a70b000000b0000000640000006c00000000
dca0: 00000001 00000002 00000001811fa79800000801811fa94080a0fb8000000cc0
dcc0: 00000001 00000001 00000000f8dddd28811fa93c811fa68000000002802b0c30
dce0:ee1d214000440dc000000000 00000000 00000001 00000000811fad8000440dc0
dd00: 00000001 00000000 00000000 8320110000440dc000000000 00000000802afa18
dd20:00000bdc00000bd8811fad8000000000811fad8000000000 00000000 00000000
dd40:adf00ec5816d5fa8816d5fa8821c3c00000000007ebc20007ebe300000000000
dd60:f8ddde448028cfa0816d5fa88288df508169cf00821c3c007ebc20007ebe3000
dd80:f8ddde448028e1e80000000180bbe932f8ddde44f8dddde8f8ddde448288df50
dda0: 83201100809cf474f8ddde448169cf00000000208169cf94821c3c947ebe3000
ddc0:7ebe2ffffffffff400000000816d5fa8821c3c008169cf0081d65fa8809cdbb0
dde0:8288df5081ffa9107ebe300082890b0000000000 00000000 00000000 00000000
de00: 00000000 00000000adf00ec500000000 000000008169cf008288df5083201100
de20:821c3c0081ffa910f8ddde448011f6e400000000 00000000821c3c7c8169cf7c
de40: 83200880821c3c407ebc20007ebe2fff82890b0c76ea4000ffffffff 00000000
de60: 000000000f000a01f8ddde68f8ddde68adf00ec500000000 00000000 00000000
de80: 00000000 01200000 83201100 00000000 000000008011e2ac0000000083200d7c
dea0: 8320102083200e7083200e8000000000f8dddf3083200880 00000000 00000000
dec0: 00000000 00000000 0000000082182f38adf00ec500000000 01200000f8dddf30
dee0: 00000000 00000000 00000000 00000078000cb21c8011fe2400000020 00000000
df00:828a5d8080a10140adf00ec501200011 00000000 00000000 00000000f8dddf30
df20: 00000000 00000078000cb21c801203d401200000 00000000 0000000076f46468
df40: 00000000 00000000 00000011 00000000 00000000 00000000 00000000 00000000
df60: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
df80: 00000003adf00ec576f464680000000076f468c000000078 80100290 83201100
dfa0:000cb21c8010006076f4646800000000 01200011 00000000 00000000 00000000
dfc0:76f464680000000076f468c000000078 0000000076e8100076f46400000cb21c
dfe0: 000000787ebe293876e0854d76dae7e620000030 01200011 00000000 00000000Call trace: mmioset from prep_new_page+0x160/0x194 prep_new_page from get_page_from_freelist+0x10f4/0x110c get_page_from_freelist from __alloc_pages+0x15c/0x280 __alloc_pages from __pte_alloc+0x28/0x1bc __pte_alloc from copy_page_range+0xc10/0xd28 copy_page_range from copy_mm+0x5cc/0x850 copy_mm from copy_process+0x508/0xd8c copy_process from kernel_clone+0x94/0x338 kernel_clone from sys_clone+0x94/0xb0 sys_clone from ret_fast_syscall+0x0/0x1c Exception stack(0xf8dddfa8 to 0xf8dddff0) dfa0: 76f46468 00000000 01200011 00000000 00000000 00000000 dfc0: 76f46468 00000000 76f468c0 00000078 00000000 76e81000 76f46400 000cb21c dfe0: 00000078 7ebe2938 76e0854d 76dae7e6 Code: e92d4100 e1a08001 e1a0e003 e2522040 (a8ac410a) ---[ end trace 0000000000000000 ]---I bisected down to this commit and reverting the commit solves the issue.
What is special about the Versatile Express graphics is that it uses a special dedicated video RAM, looks like this in the device tree
reserved-memory { #address-cells = <1>; #size-cells = <1>; ranges; /* Chipselect 3 is physically at 0x4c000000 */ vram: vram@4c000000 { /* 8 MB of designated video RAM */ compatible = "shared-dma-pool"; reg = <0x4c000000 0x00800000>; no-map; }; }; (...) clcd@1f000 { compatible = "arm,pl111", "arm,primecell"; (...) memory-region = <&vram>;This gets picked up in the driver
drivers/gpu/drm/pl111/pl111_drv.c
like this:ret = of_reserved_mem_device_init(dev); if (!ret) { dev_info(dev, "using device-specific reserved memory\n"); priv->use_device_memory = true; }Yours,
Linus Walleij
Signature · 7 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)
From 64de70dc23a66de8b7fd3e341136ac274da01e65 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <[email protected]>
Date: Wed, 4 Sep 2024 09:29:41 +0200
Subject: [PATCH] drm/fbdev-dma: Only install deferred I/O if necessary
Deferred I/O requires struct page for framebuffer memory, which is not guaranteed for all DMA ranges. We thus only install deferred I/O if we have a framebuffer that requires it.
A reported bug affected the pl111 drivers, which has video memory in either Normal or HighMem zones
[ 0.000000] Zone ranges: [ 0.000000] Normal [mem 0x0000000010000000-0x000000003fffffff] [ 0.000000] HighMem [mem 0x0000000040000000-0x000000004fffffff]
where deferred I/O only works correctly with HighMem. See the Closes tags for bug reports.
--- drivers/gpu/drm/drm_fbdev_dma.c | 71 ++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 19 deletions(-)
drivers/gpu/drm/drm_fbdev_dma.c +52 -19
@@ -36,20 +36,11 @@ static int drm_fbdev_dma_fb_release(struct fb_info *info, int user)return 0 ; } -FB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS (drm_fbdev_dma, - drm_fb_helper_damage_range, - drm_fb_helper_damage_area); -static int drm_fbdev_dma_fb_mmap (struct fb_info *info,struct vm_area_struct *vma) {struct drm_fb_helper *fb_helper = info->par; -struct drm_framebuffer *fb = fb_helper->fb; -struct drm_gem_dma_object *dma =drm_fb_dma_get_gem_obj (fb,0 ); -if (!dma->map_noncoherent) - vma->vm_page_prot =pgprot_writecombine (vma->vm_page_prot); - -return fb_deferred_io_mmap (info, vma); +return drm_gem_prime_mmap (fb_helper->buffer->gem, vma); }static void drm_fbdev_dma_fb_destroy (struct fb_info *info)
@@ -70,13 +61,40 @@ static void drm_fbdev_dma_fb_destroy(struct fb_info *info) }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_DMAMEM_OPS_RDWR, +DRM_FB_HELPER_DEFAULT_OPS , + __FB_DEFAULT_DMAMEM_OPS_DRAW, + .fb_mmap = drm_fbdev_dma_fb_mmap, + .fb_destroy = drm_fbdev_dma_fb_destroy, +}; + +FB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS (drm_fbdev_dma, + drm_fb_helper_damage_range, + drm_fb_helper_damage_area); + +static int drm_fbdev_dma_deferred_fb_mmap (struct fb_info *info,struct vm_area_struct *vma) +{ +struct drm_fb_helper *fb_helper = info->par; +struct drm_framebuffer *fb = fb_helper->fb; +struct drm_gem_dma_object *dma =drm_fb_dma_get_gem_obj (fb,0 ); + +if (!dma->map_noncoherent) + vma->vm_page_prot =pgprot_writecombine (vma->vm_page_prot); + +return fb_deferred_io_mmap (info, vma); +} + +static const struct fb_ops drm_fbdev_dma_deferred_fb_ops = { .owner =THIS_MODULE , .fb_open = drm_fbdev_dma_fb_open, .fb_release = drm_fbdev_dma_fb_release,__FB_DEFAULT_DEFERRED_OPS_RDWR (drm_fbdev_dma),DRM_FB_HELPER_DEFAULT_OPS ,__FB_DEFAULT_DEFERRED_OPS_DRAW (drm_fbdev_dma), - .fb_mmap = drm_fbdev_dma_fb_mmap, + .fb_mmap = drm_fbdev_dma_deferred_fb_mmap, .fb_destroy = drm_fbdev_dma_fb_destroy, };
@@ -89,6 +107,7 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper, {struct drm_client_dev *client = &fb_helper->client;struct drm_device *dev = fb_helper->dev; +bool use_deferred_io = false;struct drm_client_buffer *buffer;struct drm_gem_dma_object *dma_obj;struct drm_framebuffer *fb;
@@ -111,6 +130,15 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper, fb = buffer->fb; +/* +* Deferred I/O requires struct page for framebuffer memory, +* which is not guaranteed for all DMA ranges. We thus only +* install deferred I/O if we have a framebuffer that requires +* it. +*/ +if (fb->funcs->dirty) + use_deferred_io = true; + ret =drm_client_buffer_vmap (buffer, &map);if (ret) { goto err_drm_client_buffer_delete;
@@ -130,7 +158,10 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper,drm_fb_helper_fill_info (info, fb_helper, sizes); - info->fbops = &drm_fbdev_dma_fb_ops; +if (use_deferred_io) + info->fbops = &drm_fbdev_dma_deferred_fb_ops; +else + info->fbops = &drm_fbdev_dma_fb_ops;/* screen */ info->flags |=FBINFO_VIRTFB ;/* system memory */
@@ -145,13 +176,15 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper, info->fix.smem_len = info->screen_size;/* deferred I/O */ - fb_helper->fbdefio.delay =HZ /20 ; - fb_helper->fbdefio.deferred_io = drm_fb_helper_deferred_io; - - info->fbdefio = &fb_helper->fbdefio; - ret =fb_deferred_io_init (info); -if (ret) - goto err_drm_fb_helper_release_info; +if (use_deferred_io) { + fb_helper->fbdefio.delay =HZ /20 ; + fb_helper->fbdefio.deferred_io = drm_fb_helper_deferred_io; + + info->fbdefio = &fb_helper->fbdefio; + ret =fb_deferred_io_init (info); +if (ret) + goto err_drm_fb_helper_release_info; + }return 0 ;
Signature · 1 line
2.46.0
Alexander Stein
Tested-byRe: [PATCH v3 21/43] drm/fbdev-dma: Implement damage handling and deferred I/O
Hi Thomas,
Am Mittwoch, 4. September 2024, 09:41:12 CEST schrieb Thomas Zimmermann:
Quoted 5 lines
Hi Linus, Alexander,
Attached is a patch to mitigate the problem and go back to the old behavior for pl111. Can you please test it on affected and unaffected systems and report the results?
Thank you for the patch. This indeed fixes the mmap problem on my i.MX6 platform which only has Normal memory:
[ 0.000000] Zone ranges: [ 0.000000] Normal [mem 0x0000000010000000-0x000000002fffffff] [ 0.000000] HighMem empty
But please note this is not pl111 based but IPUv3 (drivers/gpu/ipu-v3). You might want to adjust the commit message.
Best regards,
Alexander
Quoted 136 lines
Am 04.09.24 um 00:53 schrieb Linus Walleij:
Quoted 133 lines · Thomas Zimmermann
Quoted 5 lines
Add support for damage handling and deferred I/O to fbdev-dma. This enables fbdev-dma to support all DMA-memory-based DRM drivers, even such with a dirty callback in their framebuffers.
Quoted 8 lines
The patch adds the code for deferred I/O and also sets a dedicated helper for struct fb_ops.fb_mmap that support coherent mappings.
v3:
- initfb_opswithFB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS()(Javier)Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>For some reason this makes the Versatile Express crash in QEMU (I can retest on real hardware if necessary):
8<--- cut here ---
Unable to handle kernel paging request at virtual address 18095000 when write [18095000] *pgd=00000000 Internal error: Oops: 805 [#1] SMP ARM CPU: 0 PID: 75 Comm: S08_ledflash Not tainted 6.9.0-rc6+ #44 Hardware name: ARM-Versatile Express PC is at mmioset+0x34/0xac LR is at 0x0 pc : [<809c2a54>] lr : [<00000000>] psr: 20000013sp :
f8dddc38ip : 18095000 fp : 00000000
r10:81109a18r9 :81238b04r8 : 00000000
r7 :00440dc0r6 :ed4f32a0r5 :ed4f32a0r4 : 00000001 r3 : 00000000 r2 :00000fc0r1 : 00000000 r0 : 18095000
Flags: nzCv IRQs on FIQs on ModeSVC_32ISA ARM Segment none
Control:10c5387dTable:81d6406aDAC: 00000051 Register r0 information: non-paged memory
Register r1 information: NULL pointer
Register r2 information: non-paged memory
Register r3 information: NULL pointer
Register r4 information: non-paged memory
Register r5 information: non-slab/vmalloc memory Register r6 information: non-slab/vmalloc memory Register r7 information: non-paged memory
Register r8 information: NULL pointer
Register r9 information: non-slab/vmalloc memory Register r10 information: non-slab/vmalloc memory Register r11 information: NULL pointer
Register r12 information: non-paged memory
ProcessS08_ledflash(pid: 75, stack limit = 0x(ptrval))Stack: (0xf8dddc38 to 0xf8dde000)dc20: 00000801
802af888
dc40:80a0fb8000440dc000000801811fad8000000000f8dddd28ed4f32a0811fa680
dc60: 00000000802b0c30ee1d2140ee1d215c95ff438500000001 00000001 00000001
dc80: 00000000 00000000 ffffffff8196a70b000000b0000000640000006c00000000
dca0: 00000001 00000002 00000001811fa79800000801811fa94080a0fb8000000cc0
dcc0: 00000001 00000001 00000000f8dddd28811fa93c811fa68000000002802b0c30
dce0:ee1d214000440dc000000000 00000000 00000001 00000000811fad8000440dc0
dd00: 00000001 00000000 00000000 8320110000440dc000000000 00000000802afa18
dd20:00000bdc00000bd8811fad8000000000811fad8000000000 00000000 00000000
dd40:adf00ec5816d5fa8816d5fa8821c3c00000000007ebc20007ebe300000000000
dd60:f8ddde448028cfa0816d5fa88288df508169cf00821c3c007ebc20007ebe3000
dd80:f8ddde448028e1e80000000180bbe932f8ddde44f8dddde8f8ddde448288df50
dda0: 83201100809cf474f8ddde448169cf00000000208169cf94821c3c947ebe3000
ddc0:7ebe2ffffffffff400000000816d5fa8821c3c008169cf0081d65fa8809cdbb0
dde0:8288df5081ffa9107ebe300082890b0000000000 00000000 00000000 00000000
de00: 00000000 00000000adf00ec500000000 000000008169cf008288df5083201100
de20:821c3c0081ffa910f8ddde448011f6e400000000 00000000821c3c7c8169cf7c
de40: 83200880821c3c407ebc20007ebe2fff82890b0c76ea4000ffffffff 00000000
de60: 000000000f000a01f8ddde68f8ddde68adf00ec500000000 00000000 00000000
de80: 00000000 01200000 83201100 00000000 000000008011e2ac0000000083200d7c
dea0: 8320102083200e7083200e8000000000f8dddf3083200880 00000000 00000000
dec0: 00000000 00000000 0000000082182f38adf00ec500000000 01200000f8dddf30
dee0: 00000000 00000000 00000000 00000078000cb21c8011fe2400000020 00000000
df00:828a5d8080a10140adf00ec501200011 00000000 00000000 00000000f8dddf30
df20: 00000000 00000078000cb21c801203d401200000 00000000 0000000076f46468
df40: 00000000 00000000 00000011 00000000 00000000 00000000 00000000 00000000
df60: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
df80: 00000003adf00ec576f464680000000076f468c000000078 80100290 83201100
dfa0:000cb21c8010006076f4646800000000 01200011 00000000 00000000 00000000
dfc0:76f464680000000076f468c000000078 0000000076e8100076f46400000cb21c
dfe0: 000000787ebe293876e0854d76dae7e620000030 01200011 00000000 00000000Call trace: mmioset from prep_new_page+0x160/0x194 prep_new_page from get_page_from_freelist+0x10f4/0x110c get_page_from_freelist from __alloc_pages+0x15c/0x280 __alloc_pages from __pte_alloc+0x28/0x1bc __pte_alloc from copy_page_range+0xc10/0xd28 copy_page_range from copy_mm+0x5cc/0x850 copy_mm from copy_process+0x508/0xd8c copy_process from kernel_clone+0x94/0x338 kernel_clone from sys_clone+0x94/0xb0 sys_clone from ret_fast_syscall+0x0/0x1c Exception stack(0xf8dddfa8 to 0xf8dddff0) dfa0: 76f46468 00000000 01200011 00000000 00000000 00000000 dfc0: 76f46468 00000000 76f468c0 00000078 00000000 76e81000 76f46400 000cb21c dfe0: 00000078 7ebe2938 76e0854d 76dae7e6 Code: e92d4100 e1a08001 e1a0e003 e2522040 (a8ac410a) ---[ end trace 0000000000000000 ]---I bisected down to this commit and reverting the commit solves the issue.
What is special about the Versatile Express graphics is that it uses a special dedicated video RAM, looks like this in the device tree
reserved-memory { #address-cells = <1>; #size-cells = <1>; ranges; /* Chipselect 3 is physically at 0x4c000000 */ vram: vram@4c000000 { /* 8 MB of designated video RAM */ compatible = "shared-dma-pool"; reg = <0x4c000000 0x00800000>; no-map; }; }; (...) clcd@1f000 { compatible = "arm,pl111", "arm,primecell"; (...) memory-region = <&vram>;This gets picked up in the driver
drivers/gpu/drm/pl111/pl111_drv.c
like this:ret = of_reserved_mem_device_init(dev); if (!ret) { dev_info(dev, "using device-specific reserved memory\n"); priv->use_device_memory = true; }Yours,
Linus Walleij
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/