From 56b70075d6b2348244a35e7fd766e940c7fd05ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <ssp@redhat.com>
Date: Thu, 6 Sep 2012 12:16:55 -0400
Subject: [PATCH] Add capability patches

---
 0001-Add-A8-surface-capability.patch          | 27 +++++++++++
 ...resent-and-client-capabilities-field.patch | 48 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 0001-Add-A8-surface-capability.patch
 create mode 100644 0002-Add-new-client_present-and-client-capabilities-field.patch

diff --git a/0001-Add-A8-surface-capability.patch b/0001-Add-A8-surface-capability.patch
new file mode 100644
index 0000000..dcd1477
--- /dev/null
+++ b/0001-Add-A8-surface-capability.patch
@@ -0,0 +1,27 @@
+From 8459b35ec0a2c1cddd7dab8b726e752bcde4c609 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <ssp@redhat.com>
+Date: Sat, 1 Sep 2012 11:19:41 -0400
+Subject: [PATCH 1/2] Add A8 surface capability
+
+Even though the ability to handle a8 surfaces was added at the same
+time as the composite command, they are logically separate, so add a
+capability bit to indicate the presence of a8 surfaces.
+---
+ spice/protocol.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/spice/protocol.h b/spice/protocol.h
+index 7008399..0671292 100644
+--- a/spice/protocol.h
++++ b/spice/protocol.h
+@@ -128,6 +128,7 @@ enum {
+     SPICE_DISPLAY_CAP_SIZED_STREAM,
+     SPICE_DISPLAY_CAP_MONITORS_CONFIG,
+     SPICE_DISPLAY_CAP_COMPOSITE,
++    SPICE_DISPLAY_CAP_A8_SURFACE,
+ };
+ 
+ enum {
+-- 
+1.7.4
+
diff --git a/0002-Add-new-client_present-and-client-capabilities-field.patch b/0002-Add-new-client_present-and-client-capabilities-field.patch
new file mode 100644
index 0000000..a85a5c1
--- /dev/null
+++ b/0002-Add-new-client_present-and-client-capabilities-field.patch
@@ -0,0 +1,48 @@
+From 361fd166b26b4450617b1f7175be9aaa7d8f6a7e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <ssp@redhat.com>
+Date: Fri, 24 Aug 2012 17:53:13 -0400
+Subject: [PATCH 2/2] Add new client_present and client capabilities fields to QXLRom
+
+The client_present field is a byte that is set of non-zero when a
+client is connected and to zero when no client is connected.
+
+The client_capabilities[58] array contains 464 bits that indicate the
+capabilities of the client. Each bit corresponds to a
+SPICE_DISPLAY_CAP_* capability. In particular, if the client has
+capability C, then bit (C % 8) in byte (C / 8) is set. The capability
+bits only have a defined meaning when a client is connected, ie., when
+client_present is non-zero. The number 58 was chosen to fill out a
+cache line in QXLRom.
+
+A new QXL_INTERRUPT_CLIENT interrupt is defined, which will be raised
+whenever a client connects or disconnects.
+---
+ spice/qxl_dev.h |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
+index 1292767..50784dc 100644
+--- a/spice/qxl_dev.h
++++ b/spice/qxl_dev.h
+@@ -148,7 +148,9 @@ typedef struct SPICE_ATTR_PACKED QXLRom {
+     uint8_t slot_gen_bits;
+     uint8_t slot_id_bits;
+     uint8_t slot_generation;
+-    uint8_t padding[3]; /* Padding to 32bit align */
++    /* appended for qxl-4 */
++    uint8_t client_present;
++    uint8_t client_capabilities[58];
+ } QXLRom;
+ 
+ /* qxl-1 compat: fixed */
+@@ -231,6 +233,7 @@ SPICE_RING_DECLARE(QXLReleaseRing, uint64_t, QXL_RELEASE_RING_SIZE);
+ #define QXL_INTERRUPT_CURSOR (1 << 1)
+ #define QXL_INTERRUPT_IO_CMD (1 << 2)
+ #define QXL_INTERRUPT_ERROR  (1 << 3)
++#define QXL_INTERRUPT_CLIENT (1 << 4)
+ 
+ /* qxl-1 compat: append only */
+ typedef struct SPICE_ATTR_PACKED QXLRam {
+-- 
+1.7.4
+