Remove drmmode_terminate_leases
PATCH 1/1 Remove drmmode_terminate_leases
From: Michel Dänzer <[email protected]>
The RandR screen private is already freed when our CloseScreen runs, so this can't do anything useful. This cleanup has to be done by the X server itself.
(Ported from amdgpu commit 5f06d6b8ba570b500956ad26fee711d5ac427818)
--- src/drmmode_display.c | 20 -------------------- src/drmmode_display.h | 2 -- src/radeon_kms.c | 1 - 3 files changed, 23 deletions(-)
src/drmmode_display.c +0 -20
@@ -2522,26 +2522,6 @@ drmmode_terminate_lease(RRLeasePtr lease)#endif // XF86_LEASE_VERSION -void -drmmode_terminate_leases (ScrnInfoPtr pScrn) -{ -#ifdef XF86_LEASE_VERSION -ScreenPtr screen =xf86ScrnToScreen (pScrn); -RADEONEntPtr pRADEONEnt =RADEONEntPriv (pScrn); -rrScrPrivPtr scr_priv =rrGetScrPriv (screen); -RRLeasePtr lease, next; - -xorg_list_for_each_entry_safe (lease, next, &scr_priv->leases, list) { -drmmode_lease_private_ptr lease_private = lease->devPrivate; -drmModeRevokeLease (pRADEONEnt->fd, lease_private->lessee_id); -free (lease_private); - lease->devPrivate =NULL ; -RRLeaseTerminated (lease); -RRLeaseFree (lease); - } -#endif -} -static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = { .resize = drmmode_xf86crtc_resize, #ifdef XF86_LEASE_VERSION
src/drmmode_display.h +0 -2
@@ -227,8 +227,6 @@ PixmapPtr drmmode_crtc_scanout_create(xf86CrtcPtr crtc,extern void drmmode_uevent_init (ScrnInfoPtr scrn,drmmode_ptr drmmode);extern void drmmode_uevent_fini (ScrnInfoPtr scrn,drmmode_ptr drmmode); -extern void drmmode_terminate_leases (ScrnInfoPtr scrn); -Bool drmmode_set_mode (xf86CrtcPtr crtc,struct drmmode_fb *fb,DisplayModePtr mode,int x,int y);
src/radeon_kms.c +0 -1
@@ -2154,7 +2154,6 @@ static Bool RADEONCloseScreen_KMS(ScreenPtr pScreen)/* Clear mask of assigned crtc's in this generation */ pRADEONEnt->assigned_crtcs =0 ; -drmmode_terminate_leases (pScrn);drmmode_uevent_fini (pScrn, &info->drmmode);radeon_drm_queue_close (pScrn);radeon_cs_flush_indirect (pScrn);
Signature · 6 lines
2.18.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180723165614.27160-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org
Alex Deucher
Acked-byQuoted 9 lines · Michel Dänzer
From: Michel Dänzer <[email protected]>
The RandR screen private is already freed when our CloseScreen runs, so this can't do anything useful. This cleanup has to be done by the X server itself.
(Ported from amdgpu commit
5f06d6b8ba570b500956ad26fee711d5ac427818)Signed-off-by Michel Dänzer <[email protected]>
Quoted 65 lines
--- src/drmmode_display.c | 20 -------------------- src/drmmode_display.h | 2 -- src/radeon_kms.c | 1 - 3 files changed, 23 deletions(-)src/drmmode_display.c +0
-20@@ -2522,26 +2522,6 @@ drmmode_terminate_lease(RRLeasePtr lease)#endif // XF86_LEASE_VERSION -void -drmmode_terminate_leases (ScrnInfoPtr pScrn) -{ -#ifdef XF86_LEASE_VERSION -ScreenPtr screen =xf86ScrnToScreen (pScrn); -RADEONEntPtr pRADEONEnt =RADEONEntPriv (pScrn); -rrScrPrivPtr scr_priv =rrGetScrPriv (screen); -RRLeasePtr lease, next; - -xorg_list_for_each_entry_safe (lease, next, &scr_priv->leases, list) { -drmmode_lease_private_ptr lease_private = lease->devPrivate; -drmModeRevokeLease (pRADEONEnt->fd, lease_private->lessee_id); -free (lease_private); - lease->devPrivate =NULL ; -RRLeaseTerminated (lease); -RRLeaseFree (lease); - } -#endif -} -static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = { .resize = drmmode_xf86crtc_resize, #ifdef XF86_LEASE_VERSIONsrc/drmmode_display.h +0
-2@@ -227,8 +227,6 @@ PixmapPtr drmmode_crtc_scanout_create(xf86CrtcPtr crtc,extern void drmmode_uevent_init (ScrnInfoPtr scrn,drmmode_ptr drmmode);extern void drmmode_uevent_fini (ScrnInfoPtr scrn,drmmode_ptr drmmode); -extern void drmmode_terminate_leases (ScrnInfoPtr scrn); -Bool drmmode_set_mode (xf86CrtcPtr crtc,struct drmmode_fb *fb,DisplayModePtr mode,int x,int y);src/radeon_kms.c +0
-2@@ -2154,7 +2154,6 @@ static Bool RADEONCloseScreen_KMS(ScreenPtr pScreen)/* Clear mask of assigned crtc's in this generation */ pRADEONEnt->assigned_crtcs =0 ; -drmmode_terminate_leases (pScrn);drmmode_uevent_fini (pScrn, &info->drmmode);radeon_drm_queue_close (pScrn);radeon_cs_flush_indirect (pScrn); --2.18.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx