Skip to content

Commit 059cfd4

Browse files
committed
drm/mgag200: Fix caching setup for remapped video memory
jira LE-1907 Rebuild_History Non-Buildable kernel-5.14.0-427.33.1.el9_4 commit-author Thomas Zimmermann <tzimmermann@suse.de> commit f5b6fd4 I/O video memory for the framebuffer supports write-combine caching mode. Simplify the driver's code that sets up the caching mode. * Map video memory with ioremap_wc(), which automatically sets up the PAT entry with write-combine caching. * Remove the now obsolete call to devm_arch_io_reserve_memtype_wc(). It is only required to mmap the video memory to user space, which the driver doesn't do. * According to the PAT documentation, arch_phys_wc_add() is best called after remapping I/O memory, so move it after ioremap. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240105082714.21881-1-tzimmermann@suse.de (cherry picked from commit f5b6fd4) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 2f5528c commit 059cfd4

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

drivers/gpu/drm/mgag200/mgag200_drv.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,13 @@ int mgag200_device_preinit(struct mga_device *mdev)
162162
}
163163
mdev->vram_res = res;
164164

165-
/* Don't fail on errors, but performance might be reduced. */
166-
devm_arch_io_reserve_memtype_wc(dev->dev, res->start, resource_size(res));
167-
devm_arch_phys_wc_add(dev->dev, res->start, resource_size(res));
168-
169-
mdev->vram = devm_ioremap(dev->dev, res->start, resource_size(res));
165+
mdev->vram = devm_ioremap_wc(dev->dev, res->start, resource_size(res));
170166
if (!mdev->vram)
171167
return -ENOMEM;
172168

169+
/* Don't fail on errors, but performance might be reduced. */
170+
devm_arch_phys_wc_add(dev->dev, res->start, resource_size(res));
171+
173172
return 0;
174173
}
175174

0 commit comments

Comments
 (0)