xf86-video-intel: 2 commits - man/intel.man src/intel_dri.c

[Chris Wilson]

 man/intel.man   |    2 ++
 src/intel_dri.c |   13 +++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit f4bbbd1dfe59031f864c7d2bbf7bb0252a3aa6a7
Author: Edward Sheldrake <ejsheldrake at gmail.com>
Date:   Mon Aug 1 14:46:08 2011 +0100

    Fix man page formatting
    
    Two option sections were not starting at the beginning of a new line.

diff --git a/man/intel.man b/man/intel.man
index 282b9f3..f74ee80 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -228,11 +228,13 @@ lag too far behind the CPU and thus noticeable delays in user responsible at
 the cost of throughput performance.
 .IP
 Default: enabled.
+.TP
 .BI "Option \*qHotPlug\*q \*q" boolean \*q
 This option controls whether the driver automatically notifies
 applications when monitors are connected or disconnected.
 .IP
 Default: enabled.
+.TP
 .BI "Option \*qZaphodHeads\*q \*q" string \*q
 .IP
 Specify the randr output(s) to use with zaphod mode for a particular driver
commit 63518c42234001ec96f638af5732c09079a3d682
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Aug 1 13:36:28 2011 +0100

    dri: Build fix for xserver-1.7.7
    
    Back in the olden days before the introduction of dixRegisterPrivate().
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_dri.c b/src/intel_dri.c
index 90f9b8f..1227dbb 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -71,7 +71,11 @@ typedef struct {
 	PixmapPtr pixmap;
 } I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
 
+#if HAS_DEVPRIVATEKEYREC
 static DevPrivateKeyRec i830_client_key;
+#else
+static int i830_client_key;
+#endif
 
 static uint32_t pixmap_flink(PixmapPtr pixmap)
 {
@@ -705,7 +709,11 @@ i830_dri2_register_frame_event_resource_types(void)
 static XID
 get_client_id(ClientPtr client)
 {
+#if HAS_DIXREGISTERPRIVATEKEY
 	XID *ptr = dixGetPrivateAddr(&client->devPrivates, &i830_client_key);
+#else
+	XID *ptr = dixLookupPrivate(&client->devPrivates, &i830_client_key);
+#endif
 	if (*ptr == 0)
 		*ptr = FakeClientID(client->index);
 	return *ptr;
@@ -1480,8 +1488,13 @@ Bool I830DRI2ScreenInit(ScreenPtr screen)
 		return FALSE;
 	}
 
+#if HAS_DIXREGISTERPRIVATEKEY
 	if (!dixRegisterPrivateKey(&i830_client_key, PRIVATE_CLIENT, sizeof(XID)))
 		return FALSE;
+#else
+	if (!dixRequestPrivate(&i830_client_key, sizeof(XID)))
+		return FALSE;
+#endif
 
 
 #if DRI2INFOREC_VERSION >= 4