mirror of
https://gitlab.freedesktop.org/mesa/drm.git
synced 2026-01-01 18:50:15 +01:00
Fix for agpgart module detection. If the kernel module has been configured
to use AGP, and the module is not present, fail gracefully instead of
doing evil things.
This commit is contained in:
parent
dc2701a9f6
commit
62838b948c
2 changed files with 14 additions and 0 deletions
|
|
@ -369,6 +369,13 @@ int r128_init(void)
|
|||
|
||||
#ifdef DRM_AGP
|
||||
dev->agp = drm_agp_init();
|
||||
if (dev->agp == NULL) {
|
||||
DRM_ERROR("Cannot initialize agpgart module.\n");
|
||||
drm_proc_cleanup();
|
||||
misc_deregister(&r128_misc);
|
||||
r128_takedown(dev);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MTRR
|
||||
dev->agp->agp_mtrr = mtrr_add(dev->agp->agp_info.aper_base,
|
||||
|
|
|
|||
|
|
@ -369,6 +369,13 @@ int r128_init(void)
|
|||
|
||||
#ifdef DRM_AGP
|
||||
dev->agp = drm_agp_init();
|
||||
if (dev->agp == NULL) {
|
||||
DRM_ERROR("Cannot initialize agpgart module.\n");
|
||||
drm_proc_cleanup();
|
||||
misc_deregister(&r128_misc);
|
||||
r128_takedown(dev);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MTRR
|
||||
dev->agp->agp_mtrr = mtrr_add(dev->agp->agp_info.aper_base,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue