RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:27:45 +00:00
Code Issues Activity Actions

Userland: Make graphics_connector_get_head_edid to read EDID from SysFS

Browse source 
The EDID blob is now exposed in the SysFS for each DisplayConnector, so
we don't need to use the ioctl interface anymore to read the EDID.
This commit is contained in:
Liav A 2022-07-16 08:33:17 +03:00 • committed by Linus Groh
parent 3af70cb0fc
commit ecf015e6ee
1 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Kernel/API/FB.h
View file

@ -7,9 +7,16 @@
#pragma once
#include <AK/Platform.h>
#include <AK/ScopeGuard.h>
#include <AK/String.h>
#include <fcntl.h>
#include <stddef.h>
#include <stdio.h>
#include <sys/cdefs.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
#include <unistd.h>
__BEGIN_DECLS
@ -20,7 +27,27 @@ ALWAYS_INLINE int graphics_connector_get_properties(int fd, GraphicsConnectorPro
ALWAYS_INLINE int graphics_connector_get_head_edid(int fd, GraphicsHeadEDID* info)
{
return ioctl(fd, GRAPHICS_IOCTL_GET_HEAD_EDID, info);
// FIXME: Optimize this function to get a minor number instead of a file descriptor.
struct stat display_connector_stat;
if (auto rc = fstat(fd, &display_connector_stat); rc < 0) {
return rc;
}
auto minor_number = minor(display_connector_stat.st_rdev);
auto edid_fd = open(String::formatted("/sys/devices/graphics/connectors/{}/edid", minor_number).characters(), O_RDONLY);
if (edid_fd < 0) {
return edid_fd;
}
ScopeGuard close_on_return([&]() {
close(edid_fd);
});
if (auto rc = read(edid_fd, info->bytes, info->bytes_size); rc < 0) {
return rc;
}
return 0;
}
ALWAYS_INLINE int fb_get_head_vertical_offset_buffer(int fd, GraphicsHeadVerticalOffset* vertical_offset)