Fix PRAMDAC. Now it shows as working in Windows 2000?

2026-02-23 09:58:19 -07:00 · 2024-11-27 17:41:54 +00:00
parent 15a2f6435c
commit baeca30c6d
2 changed files with 111 additions and 6 deletions
--- a/status.txt
+++ b/status.txt
@@ -0,0 +1,105 @@
+Driver version: Windows 2000 Version 3.37 (23 March 1999) - SDK: Windows 2000 build 1996.1
+Features:
+
+Resource Manager	Yes
+DirectDraw		Yes
+OpenGL			Yes
+Direct3D		No
+
+
+get started:
+MUST USE X86 WINDBG
+Does older windbg support coff???
+
+sxe ld nv3_mini.sys
+bp nv3_mini + 0x409ac - 0x10000 (nv3_mini+0x309ac)
+
+offset		purpose
+30a1a		RmInitRm call
+
+6be7		initClientInfo call
+6878		initClientInfo
+6bec		Check for initClientInfo success
+6bf4		initGrPatchPool call
+6bf9		Check for initGrPatchPool success
+6c01		initDmaListElementPool call
+6c06		Check for initDmaListElementPool
+6c1c		initDisplayInfo call
+
+6c26		rmInitRm End
+			Success: eax=FFFFFFFFh /  -1
+6c26			Fail eax=0
+
+30c8b		NvFindAdapter
+30cb6		NvFindAdapter -> NVIsPresent call
+1010		NVIsPresent function
+102f		NVIsPresent VideoPortGetAccessRanges call
+103b		NVIsPresent VideoPortGetAccessRanges call success check (only possible way to fail)
+127c		NVIsPresent end
+30cbb		NvFindAdapter -> NVIsPresent success check
+			Success: al=1
+			Failure: al=0
+30cca		NVIsPresent NVMapMemoryRanges call
+e9e		NVIsPresent NVMapMemoryRanges VideoPortGetDeviceBase call #1			[PCI Space]
+ea4		NVIsPresent NVMapMemoryRanges VideoPortGetDeviceBase call #1 success check	[PCI Space]
+ebd		NVIsPresent NVMapMemoryRanges VideoPortFreeDeviceBase [conditional]
+ec3		NVIsPresent NVMapMemoryRanges VideoPortFreeDeviceBase [conditional] success check
+ed6		NVIsPresent NVMapMemoryRanges VideoPortGetDeviceBase call #2  			[MMIO]
+edc		NVIsPresent NVMapMemoryRanges VideoPortGetDeviceBase call #2 success check	[MMIO]
+f0c		NVIsPresent NVMapMemoryRanges VideoPortGetDeviceBase call #3  			[LFB/RAMIN?]
+f12		NVIsPresent NVMapMemoryRanges VideoPortGetDeviceBase call #3 success check 	[LFB/RAMIN?]
+
+30ccf		NvFindAdapter NVMapMemoryRanges success check
+			Success: eax=0
+			Failure: eax=87
+30cf1		NvFindAdapter RmInitNvMapping call
+6ce6		NvFindAdapter RmInitNvMapping
+30cf6		NVIsPresent RmInitNvMapping success check
+			Success: eax!=0 (in practice 0xFFFFFFFF/-1)
+			Failure: eax=0
+30d5c		NvFindAdapter
+30d64		NvFindAdapter RmPostNvDevice call
+6d88		RmPostNvDevice function
+6d91		NvFindAdapter DevinitInitializeDevice call
+6d96		NvFindAdapter DevinitInitializeDevice success check
+			Success: eax=0 (?)
+			Failure: eax=1
+e546		DevinitInitializeDevice function
+			[very complicated]
+			[several register reads]
+e61d			DevinitPrepDeviceForInit call
+e641			DevinitPrepDeviceForInit function
+e627			InitNV call
+e67a			InitNV function
+
+30d64		NVIsPresent RmPostNvDevice success check
+			Success: eax=0 (?)
+			Failure: eax=1						
+30d78		NVIsPresent NVGetNVInfo call
+30d7d		NVIsPresent NVGetNVInfo success check
+
+3e9a		NvFindAdapter end
+			Success: eax=0
+			Fail eax=55 (RmInitNvMapping or NVIsPresent failed)
+			Fail eax=87 (NVMapMemoryRanges or NVMapFrameBuffer failed)
+
+30ea3		NVInitialize
+30f02		NVStartIO
+2aa6		NVInterrupt
+30a2d		NVGetChildDescriptor
+30a9c		NVGetPowerState
+30b20		NVSetPowerState
+
+
+Driver Init Status:
+DriverEntry								Success
+rmInitRm -> initClientInfo						Success
+rmInitRm -> initGrPatchPool						Success
+rmInitRm -> initDmaListElementPool					Success
+rmInitRm -> initDisplayInfo						Success
+rmInitRm overall							Success
+NvFindAdapter								Failing (EAX=87)
+NvFindAdapter -> NvIsPresent						Success 16:19 24/11/2024
+NvFindAdapter -> NvMapMemoryRanges					Success 19:15 26/11/2024
+NvFindAdapter -> RmInitNvMapping					Success 19:18 26/11/2024
+NvFindAdapter -> RmPostNvDevice
--- a/src/video/nv/nv3/subsystems/nv3_pramdac.c
+++ b/src/video/nv/nv3/subsystems/nv3_pramdac.c
@@ -54,16 +54,16 @@ uint32_t nv3_pramdac_get_vram_clock_register()
    // M divisor            [7-0]
    // N divisor            [16-8]
    // P divisor            [18-16]
-    return (nv3->pramdac.memory_clock_m << 16) & 0xFF;
-    + (nv3->pramdac.memory_clock_n << 8) & 0xFF;
-    + (nv3->pramdac.memory_clock_p) & 0x07; // 0-3
+    return (nv3->pramdac.memory_clock_m);
+    + (nv3->pramdac.memory_clock_n << 8);
+    + (nv3->pramdac.memory_clock_p << 16); // 0-3
 }

 uint32_t nv3_pramdac_get_pixel_clock_register()
 {
-    return (nv3->pramdac.pixel_clock_m << 16) & 0xFF;
-    + (nv3->pramdac.pixel_clock_n << 8) & 0xFF;
-    + (nv3->pramdac.pixel_clock_p) & 0x07; // 0-3    
+    return (nv3->pramdac.pixel_clock_m);
+    + (nv3->pramdac.pixel_clock_n << 8);
+    + (nv3->pramdac.pixel_clock_p << 16); // 0-3
 }

 void nv3_pramdac_set_vram_clock_register(uint32_t value)