diff options
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_agp.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c index f58c5f462438..b634d9847667 100644 --- a/drivers/gpu/drm/radeon/radeon_agp.c +++ b/drivers/gpu/drm/radeon/radeon_agp.c | |||
| @@ -133,13 +133,6 @@ int radeon_agp_init(struct radeon_device *rdev) | |||
| 133 | bool is_v3; | 133 | bool is_v3; |
| 134 | int ret; | 134 | int ret; |
| 135 | 135 | ||
| 136 | if (rdev->ddev->agp->agp_info.aper_size < 32) { | ||
| 137 | dev_warn(rdev->dev, "AGP aperture too small (%zuM) " | ||
| 138 | "need at least 32M, disabling AGP\n", | ||
| 139 | rdev->ddev->agp->agp_info.aper_size); | ||
| 140 | return -EINVAL; | ||
| 141 | } | ||
| 142 | |||
| 143 | /* Acquire AGP. */ | 136 | /* Acquire AGP. */ |
| 144 | if (!rdev->ddev->agp->acquired) { | 137 | if (!rdev->ddev->agp->acquired) { |
| 145 | ret = drm_agp_acquire(rdev->ddev); | 138 | ret = drm_agp_acquire(rdev->ddev); |
| @@ -154,6 +147,14 @@ int radeon_agp_init(struct radeon_device *rdev) | |||
| 154 | DRM_ERROR("Unable to get AGP info: %d\n", ret); | 147 | DRM_ERROR("Unable to get AGP info: %d\n", ret); |
| 155 | return ret; | 148 | return ret; |
| 156 | } | 149 | } |
| 150 | |||
| 151 | if (rdev->ddev->agp->agp_info.aper_size < 32) { | ||
| 152 | dev_warn(rdev->dev, "AGP aperture too small (%zuM) " | ||
| 153 | "need at least 32M, disabling AGP\n", | ||
| 154 | rdev->ddev->agp->agp_info.aper_size); | ||
| 155 | return -EINVAL; | ||
| 156 | } | ||
| 157 | |||
| 157 | mode.mode = info.mode; | 158 | mode.mode = info.mode; |
| 158 | agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode; | 159 | agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode; |
| 159 | is_v3 = !!(agp_status & RADEON_AGPv3_MODE); | 160 | is_v3 = !!(agp_status & RADEON_AGPv3_MODE); |
