diff options
Diffstat (limited to 'drivers/gpu/drm/drm_stub.c')
| -rw-r--r-- | drivers/gpu/drm/drm_stub.c | 20 | 
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index d59edc18301..0bf2c773c6c 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -269,25 +269,14 @@ int drm_fill_in_dev(struct drm_device *dev,  	dev->driver = driver; -	if (drm_core_has_AGP(dev)) { -		if (drm_device_is_agp(dev)) -			dev->agp = drm_agp_init(dev); -		if (drm_core_check_feature(dev, DRIVER_REQUIRE_AGP) -		    && (dev->agp == NULL)) { -			DRM_ERROR("Cannot initialize the agpgart module.\n"); -			retcode = -EINVAL; +	if (dev->driver->bus->agp_init) { +		retcode = dev->driver->bus->agp_init(dev); +		if (retcode)  			goto error_out_unreg; -		} -		if (drm_core_has_MTRR(dev)) { -			if (dev->agp) -				dev->agp->agp_mtrr = -				    mtrr_add(dev->agp->agp_info.aper_base, -					     dev->agp->agp_info.aper_size * -					     1024 * 1024, MTRR_TYPE_WRCOMB, 1); -		}  	} +  	retcode = drm_ctxbitmap_init(dev);  	if (retcode) {  		DRM_ERROR("Cannot allocate memory for context bitmap.\n"); @@ -425,7 +414,6 @@ int drm_put_minor(struct drm_minor **minor_p)   *   * Cleans up all DRM device, calling drm_lastclose().   * - * \sa drm_init   */  void drm_put_dev(struct drm_device *dev)  {  |