* [PATCH 1/2] intel_dri: Fixed a buffer leak when enable glamor.
@ 2012-07-12 10:47 zhigang.gong
2012-07-12 10:47 ` [PATCH 2/2] uxa-glyphs: Bypass uxa glyphs operations if using glamor zhigang.gong
0 siblings, 1 reply; 3+ messages in thread
From: zhigang.gong @ 2012-07-12 10:47 UTC (permalink / raw)
To: intel-gfx
From: Zhigang Gong <zhigang.gong@linux.intel.com>
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 <zhigang.gong@linux.intel.com>
---
src/intel_dri.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/intel_dri.c b/src/intel_dri.c
index ed5078e..0405937 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -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);
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] uxa-glyphs: Bypass uxa glyphs operations if using glamor.
2012-07-12 10:47 [PATCH 1/2] intel_dri: Fixed a buffer leak when enable glamor zhigang.gong
@ 2012-07-12 10:47 ` zhigang.gong
2012-07-12 12:11 ` Chris Wilson
0 siblings, 1 reply; 3+ messages in thread
From: zhigang.gong @ 2012-07-12 10:47 UTC (permalink / raw)
To: intel-gfx
From: Zhigang Gong <zhigang.gong@linux.intel.com>
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 <zhigang.gong@linux.intel.com>
---
uxa/uxa-glyphs.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c
index 6bdf101..527942a 100644
--- a/uxa/uxa-glyphs.c
+++ b/uxa/uxa-glyphs.c
@@ -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);
--
1.7.4.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] uxa-glyphs: Bypass uxa glyphs operations if using glamor.
2012-07-12 10:47 ` [PATCH 2/2] uxa-glyphs: Bypass uxa glyphs operations if using glamor zhigang.gong
@ 2012-07-12 12:11 ` Chris Wilson
0 siblings, 0 replies; 3+ messages in thread
From: Chris Wilson @ 2012-07-12 12:11 UTC (permalink / raw)
To: zhigang.gong, intel-gfx
Thanks, pushed both patches.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-12 12:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-12 10:47 [PATCH 1/2] intel_dri: Fixed a buffer leak when enable glamor zhigang.gong
2012-07-12 10:47 ` [PATCH 2/2] uxa-glyphs: Bypass uxa glyphs operations if using glamor zhigang.gong
2012-07-12 12:11 ` Chris Wilson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.