Attachment 143002 Details for Bug 109230 – Only call drmmode_validate_leases when RandR is enabled

[patch] Only call drmmode_validate_leases when RandR is enabled

radeon-validate-leases-no-RandR.diff (text/plain), 1.29 KB, created by Michel Dänzer on 2019-01-07 17:41:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2019-01-07 17:41:59 UTC

Size: 1.29 KB

patch

obsolete

>diff --git a/src/drmmode_display.c b/src/drmmode_display.c
>index d433e0611..71f3539f6 100644
>--- a/src/drmmode_display.c
>+++ b/src/drmmode_display.c
>@@ -3100,7 +3100,8 @@ Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode,
> 	}
> 
> 	/* Validate leases on VT re-entry */
>-	drmmode_validate_leases(pScrn);
>+	if (dixPrivateKeyRegistered(rrPrivKey))
>+	    drmmode_validate_leases(pScrn);
> 
> 	return TRUE;
> }
>@@ -3273,7 +3274,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 bb6885fb9..67f42e0fe 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);
>

Actions: View | Splinter Review

Attachments on bug 109230: 142983 | 142984 | 142995 | 142996 | 143002

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.