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

drm: Fix not locking wlserver around wlserver_set_output_info

Browse source
This commit is contained in:
Joshua Ashton 2023-10-06 00:30:08 +01:00 committed by Joshie
parent 434ca2be1c
commit 6f7e0c916c
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/drm.cpp
View file

@ -83,7 +83,7 @@ inline uint64_t drm_calc_s31_32(float val)
uint64_t sign_part : 1;
} s31_32_bits;
uint64_t s31_32;
} color;
} color;4
color.s31_32_bits.sign_part = val < 0 ? 1 : 0;
color.s31_32_bits.integral = uint64_t( integral );
@ -1166,7 +1166,9 @@ static bool setup_best_connector(struct drm_t *drm, bool force, bool initial)
const struct wlserver_output_info wlserver_output_info = {
.description = "Virtual screen",
};
wlserver_lock();
wlserver_set_output_info(&wlserver_output_info);
wlserver_unlock();
return true;
}
@ -1217,7 +1219,9 @@ static bool setup_best_connector(struct drm_t *drm, bool force, bool initial)
.phys_width = (int) best->connector->mmWidth,
.phys_height = (int) best->connector->mmHeight,
};
wlserver_lock();
wlserver_set_output_info(&wlserver_output_info);
wlserver_unlock();
if (!initial)
create_patched_edid(best->edid_data.data(), best->edid_data.size(), drm, best);