From patchwork Sat Jan 30 07:31:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 75872 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o0U7VK5i017483 for ; Sat, 30 Jan 2010 07:31:57 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 956DF9EADB; Fri, 29 Jan 2010 23:31:18 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id A3D869E9E2 for ; Fri, 29 Jan 2010 23:31:13 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 6E0CC76021A; Fri, 29 Jan 2010 23:31:13 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from keithp.com ([127.0.0.1]) by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id IMlmHjyuEzQj; Fri, 29 Jan 2010 23:31:09 -0800 (PST) Received: by keithp.com (Postfix, from userid 1033) id BE7F2760219; Fri, 29 Jan 2010 23:31:09 -0800 (PST) Received: from koto.keithp.com (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id B99F6760197; Fri, 29 Jan 2010 23:31:09 -0800 (PST) Received: by koto.keithp.com (Postfix, from userid 1488) id 577D411C095; Fri, 29 Jan 2010 23:31:09 -0800 (PST) From: Keith Packard To: intel-gfx@lists.freedesktop.org Date: Fri, 29 Jan 2010 23:31:06 -0800 Message-Id: <1264836666-3809-1-git-send-email-keithp@keithp.com> X-Mailer: git-send-email 1.6.6.1 Cc: dri-devel@lists.sourceforge.net Subject: [Intel-gfx] [PATCH] Initialize DRI2 info rec version 4 list of driver names X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 30 Jan 2010 07:31:57 +0000 (UTC) diff --git a/src/i830_dri.c b/src/i830_dri.c index ed9d69f..0996629 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -865,6 +865,9 @@ Bool I830DRI2ScreenInit(ScreenPtr screen) int dri2_major = 1; int dri2_minor = 0; #endif +#if DRI2INFOREC_VERSION >= 4 + const char *driverNames[1]; +#endif #ifdef USE_DRI2_1_1_0 if (xf86LoaderCheckSymbol("DRI2Version")) { @@ -879,6 +882,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen) #endif intel->deviceName = drmGetDeviceNameFromFd(intel->drmSubFD); + memset(&info, '\0', sizeof(info)); info.fd = intel->drmSubFD; info.driverName = IS_I965G(intel) ? "i965" : "i915"; info.deviceName = intel->deviceName; @@ -907,6 +911,9 @@ Bool I830DRI2ScreenInit(ScreenPtr screen) info.ScheduleSwap = I830DRI2ScheduleSwap; info.GetMSC = I830DRI2GetMSC; info.ScheduleWaitMSC = I830DRI2ScheduleWaitMSC; + info.numDrivers = 1; + info.driverNames = driverNames; + driverNames[0] = info.driverName; #endif return DRI2ScreenInit(screen, &info);