Rev 1430 | Rev 3192 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1430 | Rev 1963 | ||
|---|---|---|---|
| Line 132... | Line 132... | ||
| 132 | int default_mode; |
132 | int default_mode; |
| 133 | bool is_v3; |
133 | bool is_v3; |
| 134 | int ret; |
134 | int ret; |
| Line 135... | Line 135... | ||
| 135 | 135 | ||
| 136 | /* Acquire AGP. */ |
- | |
| 137 | if (!rdev->ddev->agp->acquired) { |
136 | /* Acquire AGP. */ |
| 138 | ret = drm_agp_acquire(rdev->ddev); |
137 | ret = drm_agp_acquire(rdev->ddev); |
| 139 | if (ret) { |
138 | if (ret) { |
| 140 | DRM_ERROR("Unable to acquire AGP: %d\n", ret); |
139 | DRM_ERROR("Unable to acquire AGP: %d\n", ret); |
| 141 | return ret; |
140 | return ret; |
| 142 | } |
- | |
| Line 143... | Line 141... | ||
| 143 | } |
141 | } |
| 144 | 142 | ||
| 145 | ret = drm_agp_info(rdev->ddev, &info); |
143 | ret = drm_agp_info(rdev->ddev, &info); |
| 146 | if (ret) { |
144 | if (ret) { |
| Line 156... | Line 154... | ||
| 156 | rdev->ddev->agp->agp_info.aper_size); |
154 | rdev->ddev->agp->agp_info.aper_size); |
| 157 | return -EINVAL; |
155 | return -EINVAL; |
| 158 | } |
156 | } |
| Line 159... | Line 157... | ||
| 159 | 157 | ||
| - | 158 | mode.mode = info.mode; |
|
| - | 159 | /* chips with the agp to pcie bridge don't have the AGP_STATUS register |
|
| - | 160 | * Just use the whatever mode the host sets up. |
|
| - | 161 | */ |
|
| 160 | mode.mode = info.mode; |
162 | if (rdev->family <= CHIP_RV350) |
| - | 163 | agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode; |
|
| - | 164 | else |
|
| 161 | agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode; |
165 | agp_status = mode.mode; |
| Line 162... | Line 166... | ||
| 162 | is_v3 = !!(agp_status & RADEON_AGPv3_MODE); |
166 | is_v3 = !!(agp_status & RADEON_AGPv3_MODE); |
| 163 | 167 | ||
| 164 | if (is_v3) { |
168 | if (is_v3) { |
| Line 270... | Line 274... | ||
| 270 | if (rdev->ddev->agp && rdev->ddev->agp->acquired) { |
274 | if (rdev->ddev->agp && rdev->ddev->agp->acquired) { |
| 271 | drm_agp_release(rdev->ddev); |
275 | drm_agp_release(rdev->ddev); |
| 272 | } |
276 | } |
| 273 | #endif |
277 | #endif |
| 274 | } |
278 | } |
| - | 279 | ||
| - | 280 | void radeon_agp_suspend(struct radeon_device *rdev) |
|
| - | 281 | { |
|
| - | 282 | radeon_agp_fini(rdev); |
|
| - | 283 | } |
|