diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-03-16 15:37:02 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-18 14:18:15 +1000 |
| commit | 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5 (patch) | |
| tree | 8b74288bdba96cf65c06c55338c81e4205aa14bc | |
| parent | 06f0a488c1b642d3cd7769da66600e5148c3fad8 (diff) | |
| download | op-kernel-dev-41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5.zip op-kernel-dev-41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5.tar.gz | |
drm/radeon: fix logic in r600_page_table_init() to match ati_gart
This fixes page table init on rs600.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_cp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c index 76eb0d5..9d14eee 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c @@ -172,7 +172,6 @@ int r600_page_table_init(struct drm_device *dev) if (entry->busaddr[i] == 0) { DRM_ERROR("unable to map PCIGART pages!\n"); r600_page_table_cleanup(dev, gart_info); - ret = -EINVAL; goto done; } entry_addr = entry->busaddr[i]; @@ -191,6 +190,7 @@ int r600_page_table_init(struct drm_device *dev) entry_addr += ATI_PCIGART_PAGE_SIZE; } } + ret = 1; done: return ret; } @@ -2095,7 +2095,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, dev_priv->gart_info.addr, dev_priv->pcigart_offset); - if (r600_page_table_init(dev)) { + if (!r600_page_table_init(dev)) { DRM_ERROR("Failed to init GART table\n"); r600_do_cleanup_cp(dev); return -EINVAL; |
