Re: Re: [Patch RFC] ttm: nouveau accelerated on Xen pv-ops kernel

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

On Thu, Jun 24, 2010 at 10:55:54PM +0300, Pasi Kärkkäinen 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.
> > > >>
> > > > .. 
> > > >> other ones too (hadn't tested yet). However, I am still failing at the same
> > > >> spot as Michael: the dreaded Opened GPU Channel 1...
> > > > 
> > > > Fixed! Plus I've tested it on:
> > > > 
> > > > 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
> > > > 
> > > > Details on: http://wiki.xensource.com/xenwiki/XenPVOPSDRM
> > > > There are two bugs that are creeping up. One of the can be disabled by
> > > > 'nopat' on the command line. The other, well the other is only seen
> > > > during shutdown.
> > > > 
> > > >>
> > > >> Anyhow.. if you want the patches:
> > > >>
> > > >> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git devel/kms-fixes
> > > > 
> > > > I rebased the branch and it is now devel/kms.fixes-0.3
> > > > 
> > > Which stable branch have you rebased it for (.31, .32, .33?)?
> > 
> > .32.
> > 
> 
> Hey,
> 
> I just tried devel/kms.fixes-0.3:
> 
> [root@f13 linux-2.6-xen]# git clone git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git linux-2.6-xen
> ..
> 
> [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/xen/stable-2.6.32.x
> [root@f13 linux-2.6-xen]# git pull
> 
> [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.
> 
> [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.
> 
> 
> Does it merge ok for you with xen/stable-2.6.32.x? 

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 = bo;
-       vma->vm_flags |= VM_RESERVED | VM_IO | VM_MIXEDMAP | VM_DONTEXPAND;
+       vma->vm_flags |= VM_RESERVED | VM_MIXEDMAP | VM_DONTEXPAND;
+       man = &bdev->man[bo->mem.mem_type];
+       if (man->flags & TTM_MEMTYPE_FLAG_NEEDS_IOREMAP)
+               vma->vm_flags |= VM_IO;
        vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
        return 0;