All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthias Hopf <mhopf@suse.de>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH] Make driver backwards compatible for server 1.6.x.
Date: Fri, 22 Jul 2011 15:46:31 +0200	[thread overview]
Message-ID: <1311342391-4129-1-git-send-email-mhopf@suse.de> (raw)

---
 src/intel_module.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/intel_module.c b/src/intel_module.c
index cd9c1a3..1e02cca 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -39,6 +39,9 @@
 #include "sna/sna_module.h"
 
 #include <xf86drmMode.h>
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,6,99,0,0)
+#include <xf86Resources.h>
+#endif
 
 static struct intel_device_info *chipset_info;
 
@@ -322,7 +325,11 @@ static Bool intel_pci_probe(DriverPtr		driver,
 	for (i = 0; i < ARRAY_SIZE(_intel_chipsets); i++) {
 		intel_pci_chipsets[i].numChipset = intel_chipsets[i].token;
 		intel_pci_chipsets[i].PCIid = intel_chipsets[i].token;
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,6,99,0,0)
+		intel_pci_chipsets[i].resList = RES_SHARED_VGA;
+#else
 		intel_pci_chipsets[i].dummy = NULL;
+#endif
 	}
 
 	scrn = xf86ConfigPciEntity(NULL, 0, entity_num, intel_pci_chipsets,
-- 
1.7.3.4

                 reply	other threads:[~2011-07-22 13:46 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1311342391-4129-1-git-send-email-mhopf@suse.de \
    --to=mhopf@suse.de \
    --cc=Intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.