Skip to content

Commit 5a498d4

Browse files
author
Thomas Zimmermann
committed
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 ipu-v3 and pl111 drivers, which have 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. v2: - test if screen_buffer supports deferred I/O (Sima) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Fixes: 808a40b ("drm/fbdev-dma: Implement damage handling and deferred I/O") Reported-by: Alexander Stein <alexander.stein@ew.tq-group.com> Closes: https://lore.kernel.org/all/23636953.6Emhk5qWAg@steina-w/ Reported-by: Linus Walleij <linus.walleij@linaro.org> Closes: https://lore.kernel.org/dri-devel/CACRpkdb+hb9AGavbWpY-=uQQ0apY9en_tWJioPKf_fAbXMP4Hg@mail.gmail.com/ Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> Tested-by: Linus Walleij <linus.walleij@linaro.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Javier Martinez Canillas <javierm@redhat.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Reviewed-by: Simona Vetter <simona.vetter@ffwll.ch> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20240904123750.31206-1-tzimmermann@suse.de
1 parent 7de295d commit 5a498d4

File tree

1 file changed

+64
-19
lines changed

1 file changed

+64
-19
lines changed

drivers/gpu/drm/drm_fbdev_dma.c

Lines changed: 64 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,11 @@ static int drm_fbdev_dma_fb_release(struct fb_info *info, int user)
3636
return 0;
3737
}
3838

39-
FB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS(drm_fbdev_dma,
40-
drm_fb_helper_damage_range,
41-
drm_fb_helper_damage_area);
42-
4339
static int drm_fbdev_dma_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
4440
{
4541
struct drm_fb_helper *fb_helper = info->par;
46-
struct drm_framebuffer *fb = fb_helper->fb;
47-
struct drm_gem_dma_object *dma = drm_fb_dma_get_gem_obj(fb, 0);
4842

49-
if (!dma->map_noncoherent)
50-
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
51-
52-
return fb_deferred_io_mmap(info, vma);
43+
return drm_gem_prime_mmap(fb_helper->buffer->gem, vma);
5344
}
5445

5546
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)
7061
}
7162

7263
static const struct fb_ops drm_fbdev_dma_fb_ops = {
64+
.owner = THIS_MODULE,
65+
.fb_open = drm_fbdev_dma_fb_open,
66+
.fb_release = drm_fbdev_dma_fb_release,
67+
__FB_DEFAULT_DMAMEM_OPS_RDWR,
68+
DRM_FB_HELPER_DEFAULT_OPS,
69+
__FB_DEFAULT_DMAMEM_OPS_DRAW,
70+
.fb_mmap = drm_fbdev_dma_fb_mmap,
71+
.fb_destroy = drm_fbdev_dma_fb_destroy,
72+
};
73+
74+
FB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS(drm_fbdev_dma,
75+
drm_fb_helper_damage_range,
76+
drm_fb_helper_damage_area);
77+
78+
static int drm_fbdev_dma_deferred_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
79+
{
80+
struct drm_fb_helper *fb_helper = info->par;
81+
struct drm_framebuffer *fb = fb_helper->fb;
82+
struct drm_gem_dma_object *dma = drm_fb_dma_get_gem_obj(fb, 0);
83+
84+
if (!dma->map_noncoherent)
85+
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
86+
87+
return fb_deferred_io_mmap(info, vma);
88+
}
89+
90+
static const struct fb_ops drm_fbdev_dma_deferred_fb_ops = {
7391
.owner = THIS_MODULE,
7492
.fb_open = drm_fbdev_dma_fb_open,
7593
.fb_release = drm_fbdev_dma_fb_release,
7694
__FB_DEFAULT_DEFERRED_OPS_RDWR(drm_fbdev_dma),
7795
DRM_FB_HELPER_DEFAULT_OPS,
7896
__FB_DEFAULT_DEFERRED_OPS_DRAW(drm_fbdev_dma),
79-
.fb_mmap = drm_fbdev_dma_fb_mmap,
97+
.fb_mmap = drm_fbdev_dma_deferred_fb_mmap,
8098
.fb_destroy = drm_fbdev_dma_fb_destroy,
8199
};
82100

@@ -89,6 +107,7 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper,
89107
{
90108
struct drm_client_dev *client = &fb_helper->client;
91109
struct drm_device *dev = fb_helper->dev;
110+
bool use_deferred_io = false;
92111
struct drm_client_buffer *buffer;
93112
struct drm_gem_dma_object *dma_obj;
94113
struct drm_framebuffer *fb;
@@ -111,6 +130,15 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper,
111130

112131
fb = buffer->fb;
113132

133+
/*
134+
* Deferred I/O requires struct page for framebuffer memory,
135+
* which is not guaranteed for all DMA ranges. We thus only
136+
* install deferred I/O if we have a framebuffer that requires
137+
* it.
138+
*/
139+
if (fb->funcs->dirty)
140+
use_deferred_io = true;
141+
114142
ret = drm_client_buffer_vmap(buffer, &map);
115143
if (ret) {
116144
goto err_drm_client_buffer_delete;
@@ -130,7 +158,10 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper,
130158

131159
drm_fb_helper_fill_info(info, fb_helper, sizes);
132160

133-
info->fbops = &drm_fbdev_dma_fb_ops;
161+
if (use_deferred_io)
162+
info->fbops = &drm_fbdev_dma_deferred_fb_ops;
163+
else
164+
info->fbops = &drm_fbdev_dma_fb_ops;
134165

135166
/* screen */
136167
info->flags |= FBINFO_VIRTFB; /* system memory */
@@ -144,14 +175,28 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper,
144175
}
145176
info->fix.smem_len = info->screen_size;
146177

147-
/* deferred I/O */
148-
fb_helper->fbdefio.delay = HZ / 20;
149-
fb_helper->fbdefio.deferred_io = drm_fb_helper_deferred_io;
178+
/*
179+
* Only set up deferred I/O if the screen buffer supports
180+
* it. If this disagrees with the previous test for ->dirty,
181+
* mmap on the /dev/fb file might not work correctly.
182+
*/
183+
if (!is_vmalloc_addr(info->screen_buffer) && info->fix.smem_start) {
184+
unsigned long pfn = info->fix.smem_start >> PAGE_SHIFT;
150185

151-
info->fbdefio = &fb_helper->fbdefio;
152-
ret = fb_deferred_io_init(info);
153-
if (ret)
154-
goto err_drm_fb_helper_release_info;
186+
if (drm_WARN_ON(dev, !pfn_to_page(pfn)))
187+
use_deferred_io = false;
188+
}
189+
190+
/* deferred I/O */
191+
if (use_deferred_io) {
192+
fb_helper->fbdefio.delay = HZ / 20;
193+
fb_helper->fbdefio.deferred_io = drm_fb_helper_deferred_io;
194+
195+
info->fbdefio = &fb_helper->fbdefio;
196+
ret = fb_deferred_io_init(info);
197+
if (ret)
198+
goto err_drm_fb_helper_release_info;
199+
}
155200

156201
return 0;
157202

0 commit comments

Comments
 (0)