diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2019-01-09 11:33:18 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2019-01-09 11:39:56 +0100 |
| commit | 38db1bbcfc019c92884c7819a6630c70e543f6b2 (patch) | |
| tree | 8a5175ec36ff3c7332ef72ed35e153c5389708b2 /src | |
| parent | 803f872f7d4b2d80be434bb42ce64dfd295b122c (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).
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/drmmode_display.c | 2 | ||||
| -rw-r--r-- | src/radeon_kms.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index d433e061..e04a17d5 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -3273,7 +3273,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 diff --git a/src/radeon_kms.c b/src/radeon_kms.c index bb6885fb..67f42e0f 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -349,13 +349,13 @@ static Bool RADEONCreateScreenResources_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->r600_shadow_fb) { pixmap = pScreen->GetScreenPixmap(pScreen); |