intel_dri: Fixed a buffer leak when enable glamor.
PATCH 1/2 intel_dri: Fixed a buffer leak when enable glamor.
From: Zhigang Gong <[email protected]>
We need to put current front_buffer to back buffer thus we don't need to create a new back buffer next time. This behaviou should be the same with or without glamor. Previous code incorrectly discard the previous front_buffer and cause a big buffer leak problem.
Signed-off-by Zhigang Gong <[email protected]>
--- src/intel_dri.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
src/intel_dri.c +3 -2
@@ -1023,9 +1023,10 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel, priv = info->front->driverPrivate;/* Exchange the current front-buffer with the fresh bo */ + + intel->back_buffer = intel->front_buffer; +drm_intel_bo_reference (intel->back_buffer);if (!(intel->uxa_flags &UXA_USE_GLAMOR )) { - intel->back_buffer = intel->front_buffer; -drm_intel_bo_reference (intel->back_buffer);intel_set_pixmap_bo (priv->pixmap, new_back);drm_intel_bo_unreference (new_back); }
Signature · 1 line
1.7.4.4
PATCH 2/2 uxa-glyphs: Bypass uxa glyphs operations if using glamor.
From: Zhigang Gong <[email protected]>
glamor_glyphs will never fallback. We don't need to keep a uxa glyphs cache picture here. Thus simply bypass the corresponding operations.
Signed-off-by Zhigang Gong <[email protected]>
--- uxa/uxa-glyphs.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)
uxa/uxa-glyphs.c +11 -1
@@ -112,6 +112,9 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen)uxa_screen_t *uxa_screen =uxa_get_screen (pScreen);int i; +if (uxa_screen->info->flags &UXA_USE_GLAMOR ) +return ; +if (!uxa_screen->glyph_cache_initialized)return ;
@@ -211,6 +214,11 @@ bail:Bool uxa_glyphs_init (ScreenPtr pScreen) { + +uxa_screen_t *uxa_screen =uxa_get_screen (pScreen); + +if (uxa_screen->info->flags &UXA_USE_GLAMOR ) +return TRUE;#if HAS_DIXREGISTERPRIVATEKEY if (!dixRegisterPrivateKey (&uxa_glyph_key,PRIVATE_GLYPH ,0 ))return FALSE;
@@ -307,8 +315,10 @@ uxa_glyph_unrealize(ScreenPtr screen,struct uxa_glyph *priv;uxa_screen_t *uxa_screen =uxa_get_screen (screen); -if (uxa_screen->info->flags &UXA_USE_GLAMOR ) +if (uxa_screen->info->flags &UXA_USE_GLAMOR ) {glamor_glyph_unrealize (screen, glyph); +return ; + }/* Use Lookup in case we have not attached to this glyph. */ priv =dixLookupPrivate (&glyph->devPrivates, &uxa_glyph_key);
Signature · 1 line
1.7.4.4
Re: [PATCH 2/2] uxa-glyphs: Bypass uxa glyphs operations if using glamor.
Thanks, pushed both patches.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre