From owner-freebsd-current@FreeBSD.ORG Thu Oct 6 01:59:09 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67F2C106566B for ; Thu, 6 Oct 2011 01:59:09 +0000 (UTC) (envelope-from nalitoja@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 198598FC12 for ; Thu, 6 Oct 2011 01:59:08 +0000 (UTC) Received: by ggeq3 with SMTP id q3so1627375gge.13 for ; Wed, 05 Oct 2011 18:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mime-version:content-type; bh=ozxy4REvR4T63s7xtlBDxISAdmmyLvQcv+HGdcwahWY=; b=ekUI3asff9cbbquUhKTVH+ZC5Hh2JkQoTPenBZtpM3+YBZO7aLX/lE6HE8kxQTwSao GnVquBDGtLP/ReEWe+rPOEaKl+6tUyYfhnTAWGLboDFTUTlx2a1muoJ6aZsxf7AXOzYW 9CsYlm3MUcoZlD6TrkwLKLiH9PC7Sz0RaZzLg= Received: by 10.146.220.33 with SMTP id s33mr84716yag.25.1317864981330; Wed, 05 Oct 2011 18:36:21 -0700 (PDT) Received: from nil (tor.cinipac.net. [79.172.193.89]) by mx.google.com with ESMTPS id h20sm10151158ani.16.2011.10.05.18.36.12 (version=SSLv3 cipher=OTHER); Wed, 05 Oct 2011 18:36:20 -0700 (PDT) From: Nali Toja To: Ali Mashtizadeh In-Reply-To: (Ali Mashtizadeh's message of "Wed, 5 Oct 2011 13:52:24 -0700") Date: Thu, 06 Oct 2011 01:35:14 +0000 Message-ID: <86vcs2q4vh.fsf@gmail.com> References: <4e4ab684.0c4c970a.68e8.6846SMTPIN_ADDED@mx.google.com> <9A6F7C9D-32D8-4387-BB03-B11CB0A91BFA@gmail.com> <20110829.214640.1568838937885804931.ken@tydfam.jp> <20110831124126.GB82908@FreeBSD.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.90 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Cc: fidaj@ukr.net, Alexey Dokuchaev , gobledb@gmail.com, yanegomi@gmail.com, Olivier Smedts , freebsd-current@freebsd.org Subject: Re: x11/nvidia-driver / Compilation has failed X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 01:59:09 -0000 --=-=-= Content-Type: text/plain Ali Mashtizadeh writes: > 2011/8/31 Alexey Dokuchaev : >> On Mon, Aug 29, 2011 at 02:59:48PM +0200, Olivier Smedts wrote: >>> 2011/8/29 ken : >>> > Could I test your patch for nvidia-driver, too? >>> > I cannot find your patch in this mail. >>> >>> I took the patch in : >>> http://lists.freebsd.org/pipermail/freebsd-current/2011-August/026515.html >>> >>> And it worked for me. >> >> Should be fixed in the port itself now (also updated to 280.13). > > Is there any reason I should still be hitting this bug when building > on 9-STABLE? With Linux compatibility disabled I can build the driver, > but the kernel refuses to load it saying it's incompatible with my > kernel version. Only if you're using 285.05.09 with the port. And it'd affect both /stable/9 and /head users. // from src/nv-freebsd.h: #if __FreeBSD_version >= 900041 #include #else #define fget(td, fd, cap, fp) fget(td, fd, fp) #endif --=-=-= Content-Type: message/rfc822 Content-Disposition: inline X-From-Line: nobody Tue Oct 4 09:44:48 2011 From: Nali Toja To: danfe@FreeBSD.org Subject: [patch] x11/nvidia-driver: add 285.05.09 support Date: Tue, 04 Oct 2011 05:44:48 +0000 Message-ID: <86pqidmhtb.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain Can you commit below tiny change? It should make testing the new version a bit easier for people who are impatient to wait for the next port update. That version also includes tunable support similar to ports/156386. $ make [...] nvidia_linux.c:40:51: error: too many arguments to function call, expected 4, have 5 if ((error = fget(td, args->fd, CAP_IOCTL, 0, &fp)) != 0) ~~~~ ^~~ @/sys/file.h:186:1: note: 'fget' declared here int fget(struct thread *td, int fd, cap_rights_t rights, struct file **fpp); ^ 1 error generated. Index: x11/nvidia-driver/Makefile =================================================================== RCS file: /a/.csup/ports/x11/nvidia-driver/Makefile,v retrieving revision 1.109 diff -u -p -r1.109 Makefile --- x11/nvidia-driver/Makefile 31 Aug 2011 12:30:24 -0000 1.109 +++ x11/nvidia-driver/Makefile 4 Oct 2011 05:33:52 -0000 @@ -112,7 +113,7 @@ post-patch: .SILENT ${REINPLACE_CMD} -e 's/status != status/status != RM_OK/' \ ${WRKSRC}/src/nvidia_os.c # Fix the build after fget(9) KPI was changed in r224778 -.if ${OSVERSION} > 900040 && ${NVVERSION} >= 1952200 +.if ${OSVERSION} > 900040 && ${NVVERSION} >= 1952200 && ${NVVERSION} < 2850509 ${REINPLACE_CMD} -e '/fget/s/&fp/0, &/' ${WRKSRC}/src/nvidia_linux.c .endif .if defined(WITH_FREEBSD_AGP) --=-=-=--