mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-15 15:06:42 +00:00
Code Issues Releases Activity

Merge DRM CVS as of 2005-12-02, adding i915 DRM support thanks to Alexey Popov,

Browse Source 
and a new r300 PCI ID.
This commit is contained in:
Eric Anholt 2005-12-03 01:23:50 +00:00
parent c703850cb4
commit 69b9fffc84
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=153033
7 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/amd64/conf/NOTES
View File

@ -204,6 +204,7 @@ device cpufreq
# Direct Rendering modules for 3D acceleration.
device drm # DRM core module required by DRM drivers
device i915drm # Intel i830 through i915
device mach64drm # ATI Rage Pro, Rage Mobility P/M, Rage XL
device mgadrm # AGP Matrox G200, G400, G450, G550
device r128drm # ATI Rage 128

4
sys/conf/files
View File

@ -535,6 +535,10 @@ dev/drm/drm_pci.c optional drm
dev/drm/drm_scatter.c optional drm
dev/drm/drm_sysctl.c optional drm
dev/drm/drm_vm.c optional drm
dev/drm/i915_dma.c optional i915drm
dev/drm/i915_drv.c optional i915drm
dev/drm/i915_irq.c optional i915drm
dev/drm/i915_mem.c optional i915drm
dev/drm/mach64_dma.c optional mach64drm
dev/drm/mach64_drv.c optional mach64drm
dev/drm/mach64_irq.c optional mach64drm

13
sys/dev/drm/drm_drv.c
View File

@ -153,9 +153,14 @@ int drm_probe(device_t dev, drm_pci_id_list_t *idlist)
{
drm_pci_id_list_t *id_entry;
int vendor, device;
device_t realdev;
vendor = pci_get_vendor(dev);
device = pci_get_device(dev);
if (!strcmp(device_get_name(dev), "drmsub"))
realdev = device_get_parent(dev);
else
realdev = dev;
vendor = pci_get_vendor(realdev);
device = pci_get_device(realdev);
id_entry = drm_find_description(vendor, device, idlist);
if (id_entry != NULL) {
@ -190,8 +195,8 @@ int drm_attach(device_t nbdev, drm_pci_id_list_t *idlist)
mtx_init(&dev->dev_lock, "drm device", NULL, MTX_DEF);
#endif
id_entry = drm_find_description(pci_get_vendor(nbdev),
pci_get_device(nbdev), idlist);
id_entry = drm_find_description(pci_get_vendor(dev->device),
pci_get_device(dev->device), idlist);
dev->id_entry = id_entry;
return drm_load(dev);

1
sys/dev/drm/drm_pciids.h
View File

@ -93,6 +93,7 @@
{0x1002, 0x5c63, CHIP_RV280|CHIP_IS_MOBILITY, "ATI Radeon RV280 Mobility"}, \
{0x1002, 0x5c64, CHIP_RV280, "ATI Radeon RV280"}, \
{0x1002, 0x5d4d, CHIP_R350, "ATI Radeon R480"}, \
{0x1002, 0x5e4b, CHIP_R420, "ATI Radeon RV410 X700PRO"}, \
{0, 0, 0, NULL}
#define r128_PCI_IDS \

2
sys/dev/drm/i915_drv.c
View File

@ -104,7 +104,7 @@ static driver_t i915_driver = {
};
extern devclass_t drm_devclass;
DRIVER_MODULE(i915, pci, i915_driver, drm_devclass, 0, 0);
DRIVER_MODULE(i915, agp, i915_driver, drm_devclass, 0, 0);
MODULE_DEPEND(i915, drm, 1, 1, 1);
#elif defined(__NetBSD__) || defined(__OpenBSD__)

1
sys/i386/conf/NOTES
View File

@ -467,6 +467,7 @@ device cpufreq
# Direct Rendering modules for 3D acceleration.
device drm # DRM core module required by DRM drivers
device i915drm # Intel i830 through i915
device mach64drm # ATI Rage Pro, Rage Mobility P/M, Rage XL
device mgadrm # AGP Matrox G200, G400, G450, G550
device r128drm # ATI Rage 128

1
sys/modules/drm/Makefile
View File

@ -2,6 +2,7 @@
SUBDIR = \
drm \
i915 \
mach64 \
mga \
r128 \