Re: Radeon HD3000

2011-05-02 Thread Owain Ainsworth
On Sun, Apr 03, 2011 at 10:47:15PM +0100, Pedro la Peu wrote:
 Indeed, thanks Brad.
 
 Index: sys/dev/pci/pcidevs
 ===
 RCS file: /cvs/src/sys/dev/pci/pcidevs,v
 retrieving revision 1.1592
 diff -u -p -r1.1592 pcidevs
 --- sys/dev/pci/pcidevs 23 Mar 2011 21:55:09 -  1.1592
 +++ sys/dev/pci/pcidevs 3 Apr 2011 21:41:11 -
 @@ -1359,6 +1359,7 @@ product ATI RADEON_HD3200_1   0x9610  Radeo
  product ATI RADEON_HD3100  0x9611  Radeon HD 3100
  product ATI RADEON_HD3200_20x9612  Radeon HD 3200
  product ATI RADEON_HD3300  0x9614  Radeon HD 3300
 +product ATI RADEON_HD3000  0x9616  Radeon HD 3000
  product ATI RADEON_HD4200_HDA  0x970f  Radeon HD 4200 HD Audio
  product ATI RADEON_HD4200  0x9710  Radeon HD 4200
  product ATI RADEON_HD4200_M0x9712  Mobility Radeon HD 4200
 
 Index: sys/dev/pci/drm/radeon_drv.c
 ===
 RCS file: /cvs/src/sys/dev/pci/drm/radeon_drv.c,v
 retrieving revision 1.51
 diff -u -p -r1.51 radeon_drv.c
 --- sys/dev/pci/drm/radeon_drv.c29 Sep 2010 13:32:22 -  1.51
 +++ sys/dev/pci/drm/radeon_drv.c3 Apr 2011 21:41:11 -
 @@ -500,6 +500,8 @@ const static struct drm_pcidev radeondrm
 CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
 {PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3850,
 CHIP_RV670|RADEON_NEW_MEMMAP},
 +   {PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3000,
 +CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
 {PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3200_1,
 CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
 {PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3200_2,

You even got the flags right.


Commited, thanks Pedro! Sorry it took me so long

-0-
-- 
WARNING TO ALL PERSONNEL:

Firings will continue until morale improves.



Radeon HD3000

2011-04-03 Thread Pedro la Peu
Hi.

Add Radeon HD 3000 to pcidevs and radeon_drv.c.

Tested and works fine with xenocara from 24/3/11 snapshot.

Index: sys/dev/pci/pcidevs
===
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1592
diff -u -p -r1.1592 pcidevs
--- sys/dev/pci/pcidevs 23 Mar 2011 21:55:09 -  1.1592
+++ sys/dev/pci/pcidevs 3 Apr 2011 20:27:57 -
@@ -1359,6 +1359,7 @@ product ATI RADEON_HD3200_1   0x9610  Radeo
 product ATI RADEON_HD3100  0x9611  Radeon HD 3100
 product ATI RADEON_HD3200_20x9612  Radeon HD 3200
 product ATI RADEON_HD3300  0x9614  Radeon HD 3300
+product ATI RADEON_HD3000  0x9616  Radeon HD 3000
 product ATI RADEON_HD4200_HDA  0x970f  Radeon HD 4200 HD Audio
 product ATI RADEON_HD4200  0x9710  Radeon HD 4200
 product ATI RADEON_HD4200_M0x9712  Mobility Radeon HD 4200
Index: sys/dev/pci/drm/radeon_drv.c
===
RCS file: /cvs/src/sys/dev/pci/drm/radeon_drv.c,v
retrieving revision 1.51
diff -u -p -r1.51 radeon_drv.c
--- sys/dev/pci/drm/radeon_drv.c29 Sep 2010 13:32:22 -  1.51
+++ sys/dev/pci/drm/radeon_drv.c3 Apr 2011 20:27:57 -
@@ -526,6 +526,8 @@ const static struct drm_pcidev radeondrm
CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4200_M,
CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
+   {PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3000,
+   CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
 {0, 0, 0}
 };


OpenBSD 4.9-current (GENERIC.MP) #0: Sun Apr  3 21:48:10 BST 2011
pedro@foo.local:/home/pedro/GENERIC.MP
real mem = 8318943232 (7933MB)
avail mem = 8083447808 (7708MB)
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.5 @ 0x9f400 (63 entries)
bios0: vendor American Megatrends Inc. version 0802 date 08/24/2010
bios0: ASUSTeK Computer INC. M4A78LT-M
acpi0 at bios0: rev 2
acpi0: sleep states S0 S1 S3 S4 S5
acpi0: tables DSDT FACP APIC MCFG OEMB SRAT HPET SSDT
acpi0: wakeup devices PCE2(S4) PCE3(S4) PCE4(S4) PCE5(S4) PCE6(S4) PCE7(S4) 
PCE9(S4) PCEA(S4) PCEB(S4) PCEC(S4) SBAZ(S4) PS2M(S4) PS2K(S4) UAR1(S4) 
P0PC(S4) UHC1(S4) UHC2(S4) UHC3(S4) USB4(S4) UHC5(S4) UHC6(S4) UHC7(S4)
acpitimer0 at acpi0: 3579545 Hz, 32 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: AMD Athlon(tm) II X4 640 Processor, 3013.97 MHz
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW
cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu0: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu0: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu0: apic clock running at 200MHz
cpu1 at mainbus0: apid 1 (application processor)
cpu1: AMD Athlon(tm) II X4 640 Processor, 3013.54 MHz
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW
cpu1: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu1: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu1: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu2 at mainbus0: apid 2 (application processor)
cpu2: AMD Athlon(tm) II X4 640 Processor, 3013.54 MHz
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW
cpu2: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu2: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu2: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
cpu3 at mainbus0: apid 3 (application processor)
cpu3: AMD Athlon(tm) II X4 640 Processor, 3013.54 MHz
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW
cpu3: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 
16-way L2 cache
cpu3: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
cpu3: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative
ioapic0 at mainbus0: apid 4 pa 0xfec0, version 21, 24 pins
acpimcfg0 at acpi0 addr 0xe000, bus 0-255
acpihpet0 at acpi0: 14318180 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 1 (P0P1)
acpiprt2 at acpi0: bus -1 (PCE2)
acpiprt3 at acpi0: bus -1 (PCE3)
acpiprt4 at acpi0: bus -1 (PCE4)
acpiprt5 at acpi0: bus -1 (PCE5)
acpiprt6 at acpi0: bus -1 (PCE6)
acpiprt7 at acpi0: bus -1 (PCE7)
acpiprt8 at acpi0: bus -1 (PCE9)
acpiprt9 at acpi0: bus 2 (PCEA)
acpiprt10 at 

Re: Radeon HD3000

2011-04-03 Thread Brad

On 03/04/11 5:06 PM, Pedro la Peu wrote:

Index: sys/dev/pci/drm/radeon_drv.c
===
RCS file: /cvs/src/sys/dev/pci/drm/radeon_drv.c,v
retrieving revision 1.51
diff -u -p -r1.51 radeon_drv.c
--- sys/dev/pci/drm/radeon_drv.c29 Sep 2010 13:32:22 -  1.51
+++ sys/dev/pci/drm/radeon_drv.c3 Apr 2011 20:27:57 -
@@ -526,6 +526,8 @@ const static struct drm_pcidev radeondrm
 CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
 {PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4200_M,
 CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
+   {PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3000,
+   CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
  {0, 0, 0}
  };


This should be kept in sorted order so move this entry above the Radeon 
HD3200_1 entry.


--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



Re: Radeon HD3000

2011-04-03 Thread Pedro la Peu
Indeed, thanks Brad.

Index: sys/dev/pci/pcidevs
===
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1592
diff -u -p -r1.1592 pcidevs
--- sys/dev/pci/pcidevs 23 Mar 2011 21:55:09 -  1.1592
+++ sys/dev/pci/pcidevs 3 Apr 2011 21:41:11 -
@@ -1359,6 +1359,7 @@ product ATI RADEON_HD3200_1   0x9610  Radeo
 product ATI RADEON_HD3100  0x9611  Radeon HD 3100
 product ATI RADEON_HD3200_20x9612  Radeon HD 3200
 product ATI RADEON_HD3300  0x9614  Radeon HD 3300
+product ATI RADEON_HD3000  0x9616  Radeon HD 3000
 product ATI RADEON_HD4200_HDA  0x970f  Radeon HD 4200 HD Audio
 product ATI RADEON_HD4200  0x9710  Radeon HD 4200
 product ATI RADEON_HD4200_M0x9712  Mobility Radeon HD 4200

Index: sys/dev/pci/drm/radeon_drv.c
===
RCS file: /cvs/src/sys/dev/pci/drm/radeon_drv.c,v
retrieving revision 1.51
diff -u -p -r1.51 radeon_drv.c
--- sys/dev/pci/drm/radeon_drv.c29 Sep 2010 13:32:22 -  1.51
+++ sys/dev/pci/drm/radeon_drv.c3 Apr 2011 21:41:11 -
@@ -500,6 +500,8 @@ const static struct drm_pcidev radeondrm
CHIP_RV635|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3850,
CHIP_RV670|RADEON_NEW_MEMMAP},
+   {PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3000,
+CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3200_1,
CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3200_2,