diff options
| author | Keith Packard <keithp@keithp.com> | 2014-06-04 22:00:45 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-07-17 11:26:44 -0700 |
| commit | bfa5c73a36230f77fb211f185152212541c9d56d (patch) | |
| tree | ef08f26f9a3cd69842b0ec523bc0dce8a7d51a39 /hw/kdrive/ephyr/ephyr.c | |
| parent | 3319e7041ff89bb01b16a1dbbac85e28b1976ae3 (diff) | |
ephyr: Free damage structure at server reset time
The usual mechanism for freeing a damage structure when the pixmap is
destroyed does not work for the screen pixmap as it isn't freed in the
normal way.
The existing driver cleanup function, scrfini, is called after the
wrapped CloseScreen functions, including damageCloseScreen, are called
and thus ephyr can't free the damage structure at that point.
Deal with this by providing an early CloseScreen hook in KdCloseScreen
which ephyr can use to free the damage structure before damage itself
shuts down.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Diffstat (limited to 'hw/kdrive/ephyr/ephyr.c')
| -rw-r--r-- | hw/kdrive/ephyr/ephyr.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index def50d8d8..49a4d2ded 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -756,6 +756,12 @@ ephyrScreenFini(KdScreenInfo * screen) } } +void +ephyrCloseScreen(ScreenPtr pScreen) +{ + ephyrUnsetInternalDamage(pScreen); +} + /* * Port of Mark McLoughlin's Xnest fix for focus in + modifier bug. * See https://bugs.freedesktop.org/show_bug.cgi?id=3030 |