From patchwork Fri Jul 22 13:46:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Hopf X-Patchwork-Id: 999372 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6MDl6G2002846 for ; Fri, 22 Jul 2011 13:47:27 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 537BDA027A for ; Fri, 22 Jul 2011 06:47:05 -0700 (PDT) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTP id 892B89E80C for ; Fri, 22 Jul 2011 06:46:46 -0700 (PDT) Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id A3E318A908 for ; Fri, 22 Jul 2011 15:46:45 +0200 (CEST) From: Matthias Hopf To: Intel-gfx@lists.freedesktop.org Date: Fri, 22 Jul 2011 15:46:31 +0200 Message-Id: <1311342391-4129-1-git-send-email-mhopf@suse.de> X-Mailer: git-send-email 1.7.3.4 Subject: [Intel-gfx] [PATCH] Make driver backwards compatible for server 1.6.x. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 22 Jul 2011 13:47:27 +0000 (UTC) --- 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 +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,6,99,0,0) +#include +#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,