diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 14:34:33 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-18 05:17:53 +0400 |
| commit | 24986ee06929a8de3a5b4722ccadf0b85c175264 (patch) | |
| tree | 96baab74b307b9566db0f493dc63de0b031ad6c2 /drivers/gpu/drm/drm_pci.c | |
| parent | 5ec467a80301fccb21eaf4bcc04cd0f4536a30d6 (diff) | |
| download | linux-24986ee06929a8de3a5b4722ccadf0b85c175264.tar.xz | |
drm: kill DRIVER_REQUIRE_AGP
Only the two intel drivers need this and they can easily check for
working agp support in their driver ->load callbacks.
This is the only reason why agp initialization could fail, so allows
us to rip out a bit of error handling code in the next patch.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_pci.c')
| -rw-r--r-- | drivers/gpu/drm/drm_pci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index efadad850288..c99c71b3d220 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -267,11 +267,6 @@ static int drm_pci_agp_init(struct drm_device *dev) if (drm_core_has_AGP(dev)) { if (drm_pci_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"); - return -EINVAL; - } if (dev->agp) { dev->agp->agp_mtrr = arch_phys_wc_add( dev->agp->agp_info.aper_base, |