RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 21:52:45 +00:00
Code Issues Activity Actions

Kernel/Graphics: Choose VMObject considering enabled state when mmaping

Browse source 
When mmaping a Framebuffer from userspace, we need to check whether the
framebuffer device is actually enabled (e.g. graphical mode is being
used) or a textual VirtualConsole is active.

Considering the above state, we mmap the right VMObject to ensure we
don't have graphical artifacts if we change the resolution from
DisplaySettings, changed to textual mode and after the resolution change
was reverted, we will see the Desktop reappearing even though we are
still in textual mode.
This commit is contained in:
Liav A 2021-05-20 21:28:18 +03:00 • committed by Andreas Kling
parent 87f8f892d8
commit db268efa69
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Kernel/Graphics/FramebufferDevice.cpp
View file

@ -22,6 +22,7 @@ namespace Kernel {
KResultOr<Region*> FramebufferDevice::mmap(Process& process, FileDescription&, const Range& range, u64 offset, int prot, bool shared) KResultOr<Region*> FramebufferDevice::mmap(Process& process, FileDescription&, const Range& range, u64 offset, int prot, bool shared)
{ {
ScopedSpinLock lock(m_activation_lock);
REQUIRE_PROMISE(video); REQUIRE_PROMISE(video);
if (!shared) if (!shared)
return ENODEV; return ENODEV;
@ -40,9 +41,15 @@ KResultOr<Region*> FramebufferDevice::mmap(Process& process, FileDescription&, c
m_real_framebuffer_region = MM.allocate_kernel_region_with_vmobject(*m_real_framebuffer_vmobject, page_round_up(framebuffer_size_in_bytes()), "Framebuffer", Region::Access::Read | Region::Access::Write); m_real_framebuffer_region = MM.allocate_kernel_region_with_vmobject(*m_real_framebuffer_vmobject, page_round_up(framebuffer_size_in_bytes()), "Framebuffer", Region::Access::Read | Region::Access::Write);
m_swapped_framebuffer_region = MM.allocate_kernel_region_with_vmobject(*m_swapped_framebuffer_vmobject, page_round_up(framebuffer_size_in_bytes()), "Framebuffer Swap (Blank)", Region::Access::Read | Region::Access::Write); m_swapped_framebuffer_region = MM.allocate_kernel_region_with_vmobject(*m_swapped_framebuffer_vmobject, page_round_up(framebuffer_size_in_bytes()), "Framebuffer Swap (Blank)", Region::Access::Read | Region::Access::Write);
RefPtr<VMObject> chosen_vmobject;
if (m_graphical_writes_enabled) {
chosen_vmobject = m_real_framebuffer_vmobject;
} else {
chosen_vmobject = m_swapped_framebuffer_vmobject;
}
auto result = process.space().allocate_region_with_vmobject( auto result = process.space().allocate_region_with_vmobject(
range, range,
vmobject.release_nonnull(), chosen_vmobject.release_nonnull(),
0, 0,
"Framebuffer", "Framebuffer",
prot, prot,
@ -62,6 +69,7 @@ void FramebufferDevice::dectivate_writes()
auto vmobject = m_swapped_framebuffer_vmobject; auto vmobject = m_swapped_framebuffer_vmobject;
m_userspace_framebuffer_region->set_vmobject(vmobject.release_nonnull()); m_userspace_framebuffer_region->set_vmobject(vmobject.release_nonnull());
m_userspace_framebuffer_region->remap(); m_userspace_framebuffer_region->remap();
m_graphical_writes_enabled = false;
} }
void FramebufferDevice::activate_writes() void FramebufferDevice::activate_writes()
{ {
@ -75,6 +83,7 @@ void FramebufferDevice::activate_writes()
auto vmobject = m_userspace_real_framebuffer_vmobject; auto vmobject = m_userspace_real_framebuffer_vmobject;
m_userspace_framebuffer_region->set_vmobject(vmobject.release_nonnull()); m_userspace_framebuffer_region->set_vmobject(vmobject.release_nonnull());
m_userspace_framebuffer_region->remap(); m_userspace_framebuffer_region->remap();
m_graphical_writes_enabled = true;
} }
String FramebufferDevice::device_name() const String FramebufferDevice::device_name() const

2
Kernel/Graphics/FramebufferDevice.h
View file

@ -59,6 +59,8 @@ private:
OwnPtr<Region> m_real_framebuffer_region; OwnPtr<Region> m_real_framebuffer_region;
OwnPtr<Region> m_swapped_framebuffer_region; OwnPtr<Region> m_swapped_framebuffer_region;
bool m_graphical_writes_enabled { true };
RefPtr<AnonymousVMObject> m_userspace_real_framebuffer_vmobject; RefPtr<AnonymousVMObject> m_userspace_real_framebuffer_vmobject;
Region* m_userspace_framebuffer_region { nullptr }; Region* m_userspace_framebuffer_region { nullptr };
}; };