From owner-freebsd-x11@FreeBSD.ORG Sat Sep 18 22:48:55 2010 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F3EE1065672 for ; Sat, 18 Sep 2010 22:48:55 +0000 (UTC) (envelope-from swell.k@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 E58958FC1B for ; Sat, 18 Sep 2010 22:48:54 +0000 (UTC) Received: by gxk8 with SMTP id 8so1292325gxk.13 for ; Sat, 18 Sep 2010 15:48:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=k/uvE5b7jVSc8W10pUOO7+cJ8UfzSHcmb50EhsXqx/c=; b=e2MUF3TPVdekBDC/Nr8tj5SsNYj1RIfWvnClzQKuPJS2Tzwb6sbyKxBA1WS+8VmrDB N4LubiLC+TuhvpO4W5OhLPQ3dcuX/k4JJUgluXeCcFYnQmv6+s5n08aqCCWlOyDbGUXY xiEAitbJbOTq+G5ISikHccea9eXQXFDU04cI8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=JZ9LidvO7RDlZux90PlHFVNT0lL32rwBGJmmnUcBTyfHjFj+eYGz60g3pZxhpB+5cM daaZFvufICGCVc39D53cLRPSzDBDO6Y49hg5+v1nj+pWJrOTyfvEA5CgXTxuuxSrIjYC vaebPEFes/bV+sZR9HwENtubBJyV+Ytb0cxLA= Received: by 10.101.164.16 with SMTP id r16mr7356246ano.199.1284850134107; Sat, 18 Sep 2010 15:48:54 -0700 (PDT) Received: from localhost (tor-exit-proxy4-readme.formlessnetworking.net [208.53.142.40]) by mx.google.com with ESMTPS id i30sm9032285anh.9.2010.09.18.15.48.51 (version=SSLv3 cipher=RC4-MD5); Sat, 18 Sep 2010 15:48:53 -0700 (PDT) From: Anonymous To: Kata Goto References: <86r5gr86wn.fsf@gmail.com> Date: Sun, 19 Sep 2010 02:48:11 +0400 In-Reply-To: (Kata Goto's message of "Sat, 18 Sep 2010 19:31:15 +0200") Message-ID: <86eicq4qj8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Cc: "Lists.FreeBSD.X11" Subject: Re: NVIDIA GeForce GTX 460 vs 16 years old screen X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2010 22:48:55 -0000 --=-=-= Content-Type: text/plain Kata Goto writes: > 2010/9/18 Anonymous writes: >> Try to select vesa(4x) explicitly or deinstall nv(4x). > >> BTW, I think your chip (0x0e22) is supported by nvidia-driver >> since 256.44, >> the latest being is 260.19.06. > > Thank you for you quickly answer, > First I have deinstall nv driver, but the problem was already here, > then, I edit my xorg.conf : I replace nv by vesa, and now it works! > But, is the 3D acceleration activate ? Of course not. If you want any 3D (not 2D) accel better install nvidia-driver. Well, for 2D accel I'd still suggest it because with nv(4x) you'll not have XVIDEO/RENDER accel on your card and nouveau(4x) is slowly bitrotting in our ports. While I'm not sure why update is delayed you can try latest nvidia-driver with my patch (attached) in the meantime. But I've only tested it on /head@amd64 + Xserver 1.9.0. Also note, I removed VDPAU bits deliberately, they're gonna be provided by libvdpau port (cf. ports/150368 et al.), the distfile doesn't have vdpau*.h headers, anyway. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=nvidia-260.19.06.diff Index: x11/nvidia-driver/Makefile =================================================================== RCS file: /a/.cvsup/ports/x11/nvidia-driver/Makefile,v retrieving revision 1.98 diff -u -p -r1.98 Makefile --- x11/nvidia-driver/Makefile 24 May 2010 03:01:56 -0000 1.98 +++ x11/nvidia-driver/Makefile 17 Sep 2010 06:00:31 -0000 @@ -6,7 +6,7 @@ # PORTNAME= nvidia-driver -DISTVERSION?= 195.36.15 +DISTVERSION?= 260.19.06 PORTREVISION?= 0 # As a reminder it can be overridden CATEGORIES= x11 kld MASTER_SITES= ${MASTER_SITE_NVIDIA} @@ -144,8 +144,6 @@ post-install: .if ${NVVERSION} < 1802900 @${REINPLACE_CMD} '/vdpau/d' ${TMPPLIST} .else - @${MKDIR} ${PREFIX}/include/vdpau - @${LN} -sf ${DOCSDIR}/vdpau*.h ${PREFIX}/include/vdpau .endif .if ${NVVERSION} < 1851829 @${REINPLACE_CMD} '/libcuda/d' ${TMPPLIST} Index: x11/nvidia-driver/distinfo =================================================================== RCS file: /a/.cvsup/ports/x11/nvidia-driver/distinfo,v retrieving revision 1.36 diff -u -p -r1.36 distinfo --- x11/nvidia-driver/distinfo 10 Apr 2010 13:40:07 -0000 1.36 +++ x11/nvidia-driver/distinfo 18 Sep 2010 21:56:37 -0000 @@ -1,9 +1,9 @@ -MD5 (NVIDIA-FreeBSD-x86-195.36.15.tar.gz) = 2537ca726240344c7eaa44857e2b134e -SHA256 (NVIDIA-FreeBSD-x86-195.36.15.tar.gz) = 21fc89fa59e2cc96e560af856a3fa583ce4bfb7975465c71170c64962201e7a1 -SIZE (NVIDIA-FreeBSD-x86-195.36.15.tar.gz) = 25614326 -MD5 (NVIDIA-FreeBSD-x86_64-195.36.15.tar.gz) = 95af03aedc818a3dfd8ae9f289746ba4 -SHA256 (NVIDIA-FreeBSD-x86_64-195.36.15.tar.gz) = d64c664398cb4dade24af6b108e03607614f1f7584c71449230c646c313d0e7e -SIZE (NVIDIA-FreeBSD-x86_64-195.36.15.tar.gz) = 26449559 +MD5 (NVIDIA-FreeBSD-x86-260.19.06.tar.gz) = f35622e9ec841473de5d9571b54875ed +SHA256 (NVIDIA-FreeBSD-x86-260.19.06.tar.gz) = 0eda86ccf4145bc6f3a67c94fb0e055a37980099fe23def26e0f64924896b4ba +SIZE (NVIDIA-FreeBSD-x86-260.19.06.tar.gz) = 27087344 +MD5 (NVIDIA-FreeBSD-x86_64-260.19.06.tar.gz) = 9808f2bb71c0ff344a6edc27e56c1e09 +SHA256 (NVIDIA-FreeBSD-x86_64-260.19.06.tar.gz) = 29c637a86b938f55af185a2a0fd67346cb8f27edc58430f3473d78dd23f4acc8 +SIZE (NVIDIA-FreeBSD-x86_64-260.19.06.tar.gz) = 27754746 MD5 (NVIDIA-FreeBSD-x86-173.14.25.tar.gz) = 1eca3916a9ae86b953f54405e1881774 SHA256 (NVIDIA-FreeBSD-x86-173.14.25.tar.gz) = c432ed94ce71e297b2d9304d9f34f906b58e2c7c4bc13d8dbac264ed52fd6261 SIZE (NVIDIA-FreeBSD-x86-173.14.25.tar.gz) = 16682722 Index: x11/nvidia-driver/pkg-plist =================================================================== RCS file: /a/.cvsup/ports/x11/nvidia-driver/pkg-plist,v retrieving revision 1.27 diff -u -p -r1.27 pkg-plist --- x11/nvidia-driver/pkg-plist 10 Apr 2010 13:40:07 -0000 1.27 +++ x11/nvidia-driver/pkg-plist 18 Sep 2010 22:23:45 -0000 @@ -10,26 +10,19 @@ @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so @exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% @unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1 -include/vdpau/vdpau.h -include/vdpau/vdpau_x11.h -@dirrm include/vdpau lib/libnvidia-tls.so.1 lib/libnvidia-tls.so lib/libnvidia-cfg.so.1 lib/libnvidia-cfg.so -lib/libGLcore.so.1 -lib/libGLcore.so -lib/libvdpau.so.1 -lib/libvdpau.so +lib/libnvidia-glcore.so.1 +lib/libnvidia-glcore.so lib/vdpau/libvdpau_nvidia.so.1 lib/libvdpau_nvidia.so -lib/vdpau/libvdpau_trace.so.1 -lib/libvdpau_trace.so lib/libXvMCNVIDIA.so.1 lib/libXvMCNVIDIA.so lib/libXvMCNVIDIA.a lib/libXvMCNVIDIA_dynamic.so.1 -@dirrm lib/vdpau +@dirrmtry lib/vdpau %%MODULESDIR%%/libnvidia-wfb.so.1 %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/libglx.so.1 @@ -37,16 +30,15 @@ lib/libXvMCNVIDIA_dynamic.so.1 @dirrmtry %%MODULESDIR%%/drivers @cwd /boot/modules nvidia.ko +@rmtry nvidia.ko.symbols @unexec kldxref %D %%LINUX%%@cwd %%LINUXBASE%% %%LINUX%%usr/lib/libGL.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libGL.so.1 -%%LINUX%%usr/lib/libGLcore.so.%%SHLIB_VERSION%% -%%LINUX%%usr/lib/libGLcore.so.1 +%%LINUX%%usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libcuda.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libcuda.so.1 %%LINUX%%usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%% -%%LINUX%%usr/lib/libnvidia-tls.so.1 %%LINUX%%usr/lib/libvdpau.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libvdpau.so.1 %%LINUX%%usr/lib/libvdpau_nvidia.so Index: x11/nvidia-driver/files/patch-lib::Makefile =================================================================== RCS file: /a/.cvsup/ports/x11/nvidia-driver/files/patch-lib::Makefile,v retrieving revision 1.4 diff -u -p -r1.4 patch-lib::Makefile --- x11/nvidia-driver/files/patch-lib::Makefile 19 Apr 2008 17:54:30 -0000 1.4 +++ x11/nvidia-driver/files/patch-lib::Makefile 8 Sep 2010 01:21:35 -0000 @@ -1,11 +1,28 @@ --- lib/Makefile.orig Fri Jun 17 09:44:23 2005 +++ lib/Makefile Wed Jun 22 19:12:16 2005 -@@ -6,7 +6,7 @@ +@@ -6,15 +6,13 @@ SUBDIR= libGL \ + libnvidia-tls \ + libnvidia-cfg \ + libnvidia-glcore \ +- libvdpau \ + libvdpau_nvidia \ +- libvdpau_trace \ + libXvMCNVIDIA + FIND_DIRS= /usr/lib \ - ${LOCALBASE}/lib + ${X11BASE}/lib -.if exists(/compat/linux) +.if exists(/compat/linux) && !defined(WITHOUT_LINUX) SUBDIR+= compat FIND_DIRS+= /compat/linux/lib \ /compat/linux/usr/lib \ +@@ -27,7 +25,7 @@ FIND_FILES!=(find ${FIND_DIRS} \ + -name libnvidia-tls.so\* -or \ + -name libnvidia-cfg.so\* -or \ + -name libnvidia-glcore.\* -or \ +- -name libvdpau\* -or \ ++ -name libvdpau_nvidia\* -or \ + -name libXvMCNVIDIA.\* -or \ + -name libglx.\* \ + | xargs ${ECHO}) Index: x11/nvidia-driver/files/patch-src::nvidia_os.c =================================================================== RCS file: x11/nvidia-driver/files/patch-src::nvidia_os.c diff -N x11/nvidia-driver/files/patch-src::nvidia_os.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/nvidia-driver/files/patch-src::nvidia_os.c 18 Sep 2010 22:40:29 -0000 @@ -0,0 +1,35 @@ +--- src/nvidia_os.c~ ++++ src/nvidia_os.c +@@ -16,6 +16,10 @@ + MALLOC_DEFINE(M_NVIDIA, "nvidia", "NVIDIA memory allocations"); + TASKQUEUE_DEFINE_THREAD(nvidia); + ++#if __FreeBSD_version >= 900015 ++static nvidia_work_t *work; ++#endif ++ + RM_STATUS NV_API_CALL os_alloc_mem( + void **address, + NvU32 size +@@ -316,7 +320,9 @@ static void os_execute_work_item(void *c + RM_STATUS NV_API_CALL os_queue_work_item(void *data) + { + RM_STATUS status; ++#if __FreeBSD_version < 900015 + nvidia_work_t *work; ++#endif + + status = os_alloc_mem((void **)&work, sizeof(nvidia_work_t)); + if (status != status) +@@ -332,7 +338,11 @@ RM_STATUS NV_API_CALL os_queue_work_item + + RM_STATUS NV_API_CALL os_flush_work_queue(void) + { ++#if __FreeBSD_version >= 900015 ++ taskqueue_drain(taskqueue_nvidia, &work->task); ++#else + taskqueue_run(taskqueue_nvidia); ++#endif + return RM_OK; + } + --=-=-=--