[Bug 14921] New: NV25 doesn' t work after commit 71adbfc874517efbba8b9f7c3f90baad0d7fb707

[Bug 14921] New: NV25 doesn' t work after commit 71adbfc874517efbba8b9f7c3f90baad0d7fb707

[bugzilla-daemon-CC+yJ3UmIYqDUpFQwHEjaQ]

http://bugs.freedesktop.org/show_bug.cgi?id=14921

           Summary: NV25 doesn't work after commit
                    71adbfc874517efbba8b9f7c3f90baad0d7fb707
           Product: xorg
           Version: unspecified
          Platform: Other
        OS/Version: All
            Status: NEW
          Severity: normal
          Priority: medium
         Component: Driver/nouveau
        AssignedTo: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
        ReportedBy: peter-sWXtQFFYX8bYtjvyW6yDsg@public.gmane.org
         QAContact: xorg-team-go0+a7rfsptAfugRpC6u6w@public.gmane.org


After drm commit 71adbfc874517efbba8b9f7c3f90baad0d7fb707 nouveau no longer
works on my nv25, even with the fix in commit
5f15f317fb304f6a2321c033d401f603b365f2d0 it still doesn't work. Commenting out:

NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffff0ff);

makes it work.

03:00.0 VGA Compatible controller [0300]: nVidia Corporation NV25 [GeForce4 Ti
4400] [10de:0251] (rev a2)


-- 
Configure bugmail: http://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

[Bug 14921] NV25 doesn' t work after commit 71adbfc874517efbba8b9f7c3f90baad0d7fb707

[bugzilla-daemon-CC+yJ3UmIYqDUpFQwHEjaQ]

http://bugs.freedesktop.org/show_bug.cgi?id=14921


Stuart Bennett <sb476-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |sb476-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org




--- Comment #1 from Stuart Bennett <sb476-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>  2008-03-09 19:46:00 PST ---
Does changing NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffff0ff); to
NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffffeff); make it work?


-- 
Configure bugmail: http://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

[Bug 14921] NV25 doesn' t work after commit 71adbfc874517efbba8b9f7c3f90baad0d7fb707

[bugzilla-daemon-CC+yJ3UmIYqDUpFQwHEjaQ]

http://bugs.freedesktop.org/show_bug.cgi?id=14921





--- Comment #2 from Peter Winters <peter-sWXtQFFYX8bYtjvyW6yDsg@public.gmane.org>  2008-03-10 05:53:20 PST ---
(In reply to comment #1)
> Does changing NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffff0ff); to
> NV_WRITE(NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffffeff); make it work?
> 

Nope, still the same problem.


-- 
Configure bugmail: http://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

[Bug 14921] NV25 doesn' t work after commit 71adbfc874517efbba8b9f7c3f90baad0d7fb707

[bugzilla-daemon-CC+yJ3UmIYqDUpFQwHEjaQ]

http://bugs.freedesktop.org/show_bug.cgi?id=14921





--- Comment #3 from Stuart Bennett <sb476-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>  2008-03-10 09:17:05 PST ---
Any change by doing either or both of these blocks of changes?

diff --git a/shared-core/nv04_mc.c b/shared-core/nv04_mc.c
index 766f3a3..43131f1 100644
--- a/shared-core/nv04_mc.c
+++ b/shared-core/nv04_mc.c
@@ -12,6 +12,10 @@ nv04_mc_init(struct drm_device *dev)
        saved_pci_nv_1 = NV_READ(NV04_PBUS_PCI_NV_1);
        saved_pci_nv_19 = NV_READ(NV04_PBUS_PCI_NV_19);

+       NV_WRITE(0x108c, 0x51);
+       NV_WRITE(0x1830, 0);
+       NV_WRITE(0x180c, 0xf800);
+
        /* clear busmaster bit */
        NV_WRITE(NV04_PBUS_PCI_NV_1, saved_pci_nv_1 & ~(0x00000001 << 2));
        /* clear SBA and AGP bits */
@@ -20,6 +24,8 @@ nv04_mc_init(struct drm_device *dev)
        /* Power up everything, resetting each individual unit will
         * be done later if needed.
         */
+       NV_WRITE(NV03_PMC_ENABLE, 0xFFFF0FFF);
+       udelay(400);
        NV_WRITE(NV03_PMC_ENABLE, 0xFFFFFFFF);

        /* and restore (gives effect of resetting AGP) */


-- 
Configure bugmail: http://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

[Bug 14921] NV25 doesn' t work after commit 71adbfc874517efbba8b9f7c3f90baad0d7fb707

[bugzilla-daemon-CC+yJ3UmIYqDUpFQwHEjaQ]

http://bugs.freedesktop.org/show_bug.cgi?id=14921





--- Comment #4 from Stuart Bennett <sb476-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>  2008-03-10 17:40:59 PST ---
Created an attachment (id=15020)
 --> (http://bugs.freedesktop.org/attachment.cgi?id=15020)
Move AGP reset, and cycle PGRAPH

Can you check it still works in this form please


-- 
Configure bugmail: http://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

[Bug 14921] NV25 doesn' t work after commit 71adbfc874517efbba8b9f7c3f90baad0d7fb707

[bugzilla-daemon-CC+yJ3UmIYqDUpFQwHEjaQ]

http://bugs.freedesktop.org/show_bug.cgi?id=14921





--- Comment #5 from Stuart Bennett <sb476-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>  2008-03-10 17:57:23 PST ---
Also worth testing with the udelay replaced with a read of PMC_ENABLE


-- 
Configure bugmail: http://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

[Bug 14921] NV25 doesn' t work after commit 71adbfc874517efbba8b9f7c3f90baad0d7fb707

[bugzilla-daemon-CC+yJ3UmIYqDUpFQwHEjaQ]

http://bugs.freedesktop.org/show_bug.cgi?id=14921





--- Comment #6 from Peter Winters <peter-sWXtQFFYX8bYtjvyW6yDsg@public.gmane.org>  2008-03-11 06:55:55 PST ---
Still works, also works without the udelay and with udelay replaced with a
PMC_ENABLE read.


-- 
Configure bugmail: http://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

[Bug 14921] NV25 doesn' t work after commit 71adbfc874517efbba8b9f7c3f90baad0d7fb707

[bugzilla-daemon-CC+yJ3UmIYqDUpFQwHEjaQ]

http://bugs.freedesktop.org/show_bug.cgi?id=14921


Stuart Bennett <sb476-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




--- Comment #7 from Stuart Bennett <sb476-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>  2008-03-11 09:50:49 PST ---
Pushed


-- 
Configure bugmail: http://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.