diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2019-01-10 17:00:12 +0100 |
---|---|---|
committer | Michel Dänzer <michel.daenzer@amd.com> | 2019-01-10 17:00:12 +0100 |
commit | f3c0939a0cbb93c367ece3d41dc69824f585af42 (patch) | |
tree | 3af45cf264671fd138141c4887a8fa588fd6e549 | |
parent | f3ddda618ec86650ed85f8b140a5db1394676748 (diff) |
Only call drmmode_uevent_init if RandR is enabled
There's no point in listening for hotplug events if RandR is disabled,
as there's no other mechanism for them to be propagated. We were already
mostly ignoring them in that case.
Inspired by
https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/commit/1a489142c8e6a4828348cc9afbd0f430d3b1e2d8
(via https://bugs.freedesktop.org/109230#c11).
(Ported from radeon commit 38db1bbcfc019c92884c7819a6630c70e543f6b2)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | src/amdgpu_kms.c | 4 | ||||
-rw-r--r-- | src/drmmode_display.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c index 4cd46f2..47e2170 100644 --- a/src/amdgpu_kms.c +++ b/src/amdgpu_kms.c @@ -318,13 +318,13 @@ static Bool AMDGPUCreateScreenResources_KMS(ScreenPtr pScreen) RROutputChanged(rrScrPriv->primaryOutput, FALSE); rrScrPriv->layoutChanged = TRUE; } + + drmmode_uevent_init(pScrn, &info->drmmode); } if (!drmmode_set_desired_modes(pScrn, &info->drmmode, pScreen->isGPU)) return FALSE; - drmmode_uevent_init(pScrn, &info->drmmode); - if (info->shadow_fb) { pixmap = pScreen->GetScreenPixmap(pScreen); diff --git a/src/drmmode_display.c b/src/drmmode_display.c index fdadf89..85a0270 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -3907,7 +3907,7 @@ restart_destroy: /* Check to see if a lessee has disappeared */ drmmode_validate_leases(scrn); - if (changed && dixPrivateKeyRegistered(rrPrivKey)) { + if (changed) { #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) RRSetChanged(xf86ScrnToScreen(scrn)); #else |