fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-28 04:00:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'modeset' into 'master'

Browse source 
Screen could not recover from screen saving when using modesetting with atomic modeset

See merge request xorg/xserver!276
This commit is contained in:
JeffyChen 2025-12-17 16:19:34 +00:00
commit 8044e98fb6
1 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
hw/xfree86/drivers/modesetting/drmmode_display.c
View file

@ -726,31 +726,50 @@ drmmode_set_dpms(ScrnInfoPtr scrn, int dpms, int flags)
}
static int
drmmode_output_disable(xf86OutputPtr output)
drmmode_output_dpms_atomic(xf86OutputPtr output, int mode)
{
modesettingPtr ms = modesettingPTR(output->scrn);
drmmode_output_private_ptr drmmode_output = output->driver_private;
xf86CrtcPtr crtc = drmmode_output->current_crtc;
drmModeAtomicReq *req = drmModeAtomicAlloc();
drmModeAtomicReq *req;
uint32_t flags = DRM_MODE_ATOMIC_ALLOW_MODESET;
int ret = 0;
if (mode == DPMSModeOn && !crtc)
return 1;
assert(ms->atomic_modeset);
req = drmModeAtomicAlloc();
if (!req)
return 1;
ret |= connector_add_prop(req, drmmode_output,
DRMMODE_CONNECTOR_CRTC_ID, 0);
if (crtc)
ret |= crtc_add_dpms_props(req, crtc, DPMSModeOff, NULL);
ret |= crtc_add_dpms_props(req, crtc, mode, NULL);
if (mode == DPMSModeOn) {
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmModeModeInfo kmode;
drmmode_ConvertToKMode(crtc->scrn, &kmode, &crtc->mode);
ret |= drm_mode_ensure_blob(crtc, kmode);
ret |= connector_add_prop(req, drmmode_output,
DRMMODE_CONNECTOR_CRTC_ID,
drmmode_crtc->mode_crtc->crtc_id);
ret |= crtc_add_prop(req, drmmode_crtc,
DRMMODE_CRTC_ACTIVE, 1);
ret |= crtc_add_prop(req, drmmode_crtc,
DRMMODE_CRTC_MODE_ID,
drmmode_crtc->current_mode->blob_id);
} else {
ret |= connector_add_prop(req, drmmode_output,
DRMMODE_CONNECTOR_CRTC_ID, 0);
}
if (ret == 0)
ret = drmModeAtomicCommit(ms->fd, req, flags, NULL);
if (ret == 0)
drmmode_output->current_crtc = NULL;
drmModeAtomicFree(req);
return ret;
}
@ -2979,8 +2998,8 @@ drmmode_output_dpms(xf86OutputPtr output, int mode)
drmmode_output->dpms = mode;
if (ms->atomic_modeset) {
if (mode != DPMSModeOn && !ms->pending_modeset)
drmmode_output_disable(output);
if (!ms->pending_modeset)
drmmode_output_dpms_atomic(output, mode);
} else {
drmModeConnectorSetProperty(drmmode->fd, koutput->connector_id,
drmmode_output->dpms_enum_id, mode);