d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable the drm_initmap calls in radeon_cp.c, due to them resulting in improper

Browse Source 
handling of pci resources, and mapping framebuffer leading to panics on X
startup.  The proper solution involves use of bus_alloc_resource without
RF_ACTIVE, but this code is being rewritten in DRM CVS currently, and disabling
for now doesn't remove any features, so take the easy route.

PR:		kern/80718
Approved by:	re (scottl)
This commit is contained in:
anholt 2005-06-28 21:38:08 +00:00
parent 6b954a1933
commit 074ec1e214
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/drm/radeon_cp.c
View File

@ -2031,6 +2031,11 @@ int radeon_preinit(struct drm_device *dev, unsigned long flags)
break;
}
/* Disable initmaps because it is broken on FreeBSD, and results in
* crashes on startup for some. The proper fix will involve being
* smarter about allocating PCI resources.
*/
/*
ret = drm_initmap(dev, drm_get_resource_start(dev, 2),
drm_get_resource_len(dev, 2), 2, _DRM_REGISTERS,
_DRM_READ_ONLY);
@ -2042,6 +2047,7 @@ int radeon_preinit(struct drm_device *dev, unsigned long flags)
_DRM_WRITE_COMBINING);
if (ret != 0)
return ret;
*/
/* The original method of detecting AGP is known to not work correctly,
* according to Mike Harris. The solution is to walk the capabilities