Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

drm: embed drm_t.mode

Browse source 
This will allow us to store a custom mode there, instead of a
mode that comes from the EDID.
This commit is contained in:
Simon Ser 2021-07-20 17:31:57 +02:00
parent 127b1b510e
commit 852d3b12a9
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/drm.cpp
View file

@ -430,23 +430,26 @@ int init_drm(struct drm_t *drm, const char *device)
* highest refresh rate */ * highest refresh rate */
std::stable_sort(connector->modes, connector->modes + connector->count_modes, compare_modes); std::stable_sort(connector->modes, connector->modes + connector->count_modes, compare_modes);
const drmModeModeInfo *mode = nullptr;
if ( g_nOutputWidth != 0 || g_nOutputHeight != 0 || g_nNestedRefresh != 0 ) if ( g_nOutputWidth != 0 || g_nOutputHeight != 0 || g_nNestedRefresh != 0 )
{ {
drm->mode = get_matching_mode(connector, g_nOutputWidth, g_nOutputHeight, g_nNestedRefresh); mode = get_matching_mode(connector, g_nOutputWidth, g_nOutputHeight, g_nNestedRefresh);
} }
if (!drm->mode) { if (!mode) {
drm->mode = get_matching_mode(connector, 0, 0, 0); mode = get_matching_mode(connector, 0, 0, 0);
} }
if (!drm->mode) { if (!mode) {
fprintf(stderr, "could not find mode!\n"); fprintf(stderr, "could not find mode!\n");
return -1; return -1;
} }
fprintf( stderr, "drm: selected mode %dx%d@%uHz\n", drm->mode->hdisplay, drm->mode->vdisplay, drm->mode->vrefresh ); fprintf( stderr, "drm: selected mode %dx%d@%uHz\n", mode->hdisplay, mode->vdisplay, mode->vrefresh );
if (drmModeCreatePropertyBlob(drm->fd, drm->mode, sizeof(*drm->mode), &drm->mode_id) != 0) drm->mode = *mode;
if (drmModeCreatePropertyBlob(drm->fd, &drm->mode, sizeof(drm->mode), &drm->mode_id) != 0)
return -1; return -1;
/* find encoder: */ /* find encoder: */
@ -546,9 +549,9 @@ int init_drm(struct drm_t *drm, const char *device)
std::thread flip_handler_thread( flip_handler_thread_run ); std::thread flip_handler_thread( flip_handler_thread_run );
flip_handler_thread.detach(); flip_handler_thread.detach();
g_nOutputWidth = drm->mode->hdisplay; g_nOutputWidth = drm->mode.hdisplay;
g_nOutputHeight = drm->mode->vdisplay; g_nOutputHeight = drm->mode.vdisplay;
g_nOutputRefresh = drm->mode->vrefresh; g_nOutputRefresh = drm->mode.vrefresh;
if ( g_nOutputWidth < g_nOutputHeight ) if ( g_nOutputWidth < g_nOutputHeight )
{ {
@ -558,8 +561,8 @@ int init_drm(struct drm_t *drm, const char *device)
if ( g_bRotated ) if ( g_bRotated )
{ {
g_nOutputWidth = drm->mode->vdisplay; g_nOutputWidth = drm->mode.vdisplay;
g_nOutputHeight = drm->mode->hdisplay; g_nOutputHeight = drm->mode.hdisplay;
} }
if (g_bUseLayers) { if (g_bUseLayers) {

2
src/drm.hpp
View file

@ -63,7 +63,7 @@ struct drm_t {
int kms_in_fence_fd; int kms_in_fence_fd;
int kms_out_fence_fd; int kms_out_fence_fd;
const drmModeModeInfo *mode; drmModeModeInfo mode;
uint32_t mode_id; uint32_t mode_id;
uint32_t crtc_id; uint32_t crtc_id;
uint32_t connector_id; uint32_t connector_id;