[Qemu-devel] [PULL 0/1] spice: surface switch fast path requires same format too.

[Qemu-devel] [PULL 0/1] spice: surface switch fast path requires same format too.

[Gerd Hoffmann]

  Hi,

Spice patch queue, carrying a single bugfix.

please pull,
  Gerd

The following changes since commit 18640989a9f5e4d2e84b566c52ff1fccfa0dbf4a:

  Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging (2015-09-19 15:59:52 +0100)

are available in the git repository at:


  git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20150921-1

for you to fetch changes up to b2af43cc379e1d4c30d92af257bedebf0e3f618a:

  spice: surface switch fast path requires same format too. (2015-09-21 09:52:07 +0200)

----------------------------------------------------------------
spice: surface switch fast path requires same format too.

----------------------------------------------------------------
Gerd Hoffmann (1):
      spice: surface switch fast path requires same format too.

 ui/spice-display.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[Qemu-devel] [PULL 1/1] spice: surface switch fast path requires same format too.

[Gerd Hoffmann]

Commit "555e72f spice: rework mirror allocation, add no-resize fast path"
adds a fast path for surface switches which does't go through the full
primary surface destroy and re-recreation in case the new surface is
identical to the old one (page-flip).  It checks the size only though,
but the format must be identical too.  This patch adds the format check.

Commit "0002a51 ui/spice: Support shared surface for most pixman
formats" increases the chance to actually trigger this.

https://bugzilla.redhat.com/show_bug.cgi?id=1247479

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/spice-display.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/spice-display.c b/ui/spice-display.c
index 77c8cba..0489131 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -408,7 +408,8 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd,
 
     if (surface && ssd->surface &&
         surface_width(surface) == pixman_image_get_width(ssd->surface) &&
-        surface_height(surface) == pixman_image_get_height(ssd->surface)) {
+        surface_height(surface) == pixman_image_get_height(ssd->surface) &&
+        surface_format(surface) == pixman_image_get_format(ssd->surface)) {
         /* no-resize fast path: just swap backing store */
         dprint(1, "%s/%d: fast (%dx%d)\n", __func__, ssd->qxl.id,
                surface_width(surface), surface_height(surface));
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/1] spice: surface switch fast path requires same format too.

[Peter Maydell]

On 21 September 2015 at 02:13, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Spice patch queue, carrying a single bugfix.
>
> please pull,
>   Gerd
>
> The following changes since commit 18640989a9f5e4d2e84b566c52ff1fccfa0dbf4a:
>
>   Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging (2015-09-19 15:59:52 +0100)
>
> are available in the git repository at:
>
>
>   git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20150921-1
>
> for you to fetch changes up to b2af43cc379e1d4c30d92af257bedebf0e3f618a:
>
>   spice: surface switch fast path requires same format too. (2015-09-21 09:52:07 +0200)
>
> ----------------------------------------------------------------
> spice: surface switch fast path requires same format too.
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM