From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: Re: [Patch RFC] ttm: nouveau accelerated on Xen pv-ops kernel Date: Thu, 24 Jun 2010 17:00:29 -0400 Message-ID: <20100624210029.GA3602@phenom.dumpdata.com> References: <4B9C0BAA.4060007@invisiblethingslab.com> <20100609174342.GA13712@phenom.dumpdata.com> <20100617175133.GA18282@phenom.dumpdata.com> <4C213A19.2090900@invisiblethingslab.com> <20100623125430.GA8070@phenom.dumpdata.com> <20100624195554.GC17817@reaktio.net> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline In-Reply-To: <20100624195554.GC17817@reaktio.net> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= Cc: Arvind R , Jeremy Fitzhardinge , xen-devel@lists.xensource.com, Joanna Rutkowska , Michael D Labriola , xen-devel-bounces@lists.xensource.com List-Id: xen-devel@lists.xenproject.org On Thu, Jun 24, 2010 at 10:55:54PM +0300, Pasi K=E4rkk=E4inen wrote: > On Wed, Jun 23, 2010 at 08:54:30AM -0400, Konrad Rzeszutek Wilk wrote: > > On Wed, Jun 23, 2010 at 12:32:57AM +0200, Joanna Rutkowska wrote: > > > On 06/17/10 19:51, Konrad Rzeszutek Wilk wrote: > > > >>> And my X log ends abruptly after this line: > > > >>> (II) NOUVEAU(0): Opened GPU Channel 1 > > > >> > > > >> > > > >> So, I've spent the last two weeks trying to get this to work. > > > >> > > > > ..=20 > > > >> other ones too (hadn't tested yet). However, I am still failing = at the same > > > >> spot as Michael: the dreaded Opened GPU Channel 1... > > > >=20 > > > > Fixed! Plus I've tested it on: > > > >=20 > > > > GeForce 1 256 > > > > GeForce 3 NV20 > > > > GeForce 4 Ti 4200 > > > > GeForce 8600 GT > > > > ICH5 82865G > > > > ICH7 82G33/G31G > > > > ICH8 82Q963/Q965 > > > > Matrox G450 > > > > Radeon ES1000 > > > > Radeon HD 3200 > > > > Radeon R100 QD (7200) > > > > Radeon RV100QY (7000) > > > > Radeon RV710 [Radeon HD 4350] > > > > RIVA TNT2 Pro > > > >=20 > > > > Details on: http://wiki.xensource.com/xenwiki/XenPVOPSDRM > > > > There are two bugs that are creeping up. One of the can be disabl= ed by > > > > 'nopat' on the command line. The other, well the other is only se= en > > > > during shutdown. > > > >=20 > > > >> > > > >> Anyhow.. if you want the patches: > > > >> > > > >> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git dev= el/kms-fixes > > > >=20 > > > > I rebased the branch and it is now devel/kms.fixes-0.3 > > > >=20 > > > Which stable branch have you rebased it for (.31, .32, .33?)? > >=20 > > .32. > >=20 >=20 > Hey, >=20 > I just tried devel/kms.fixes-0.3: >=20 > [root@f13 linux-2.6-xen]# git clone git://git.kernel.org/pub/scm/linux/= kernel/git/jeremy/xen.git linux-2.6-xen > .. >=20 > [root@f13 linux-2.6-xen]# cd linux-2.6-xen/ > [root@f13 linux-2.6-xen]# git checkout -b xen/stable-2.6.32.x origin/xe= n/stable-2.6.32.x > [root@f13 linux-2.6-xen]# git pull >=20 > [root@f13 linux-2.6-xen]# git remote add -f konrad git://git.kernel.org= /pub/scm/linux/kernel/git/konrad/xen.git > [root@f13 linux-2.6-xen]# git pull > Already up-to-date. >=20 > [root@f13 linux-2.6-xen]# git merge konrad/devel/kms.fixes-0.3 > Auto-merging drivers/char/agp/intel-agp.c > Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo_vm.c > Auto-merging drivers/gpu/drm/ttm/ttm_tt.c > Automatic merge failed; fix conflicts and then commit the result. >=20 >=20 > Does it merge ok for you with xen/stable-2.6.32.x?=20 No. I get the same. The fault is that my patches assumes a bit different tree. What you need is to fixup to this: vma->vm_private_data =3D bo; - vma->vm_flags |=3D VM_RESERVED | VM_IO | VM_MIXEDMAP | VM_DONTEXP= AND; + vma->vm_flags |=3D VM_RESERVED | VM_MIXEDMAP | VM_DONTEXPAND; + man =3D &bdev->man[bo->mem.mem_type]; + if (man->flags & TTM_MEMTYPE_FLAG_NEEDS_IOREMAP) + vma->vm_flags |=3D VM_IO; vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); return 0;