diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2011-09-16 12:04:08 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:33 -0700 |
| commit | 06b995be61d1352337c792e8f83048b773e32a41 (patch) | |
| tree | 53decc62ac30c5e8d63beb90537441e9d90adb83 /drivers/gpu/drm/radeon/radeon_ttm.c | |
| parent | 3917a8efa50bc38ef2f2194a5e35c2062640feed (diff) | |
| download | kernel_samsung_tuna-06b995be61d1352337c792e8f83048b773e32a41.zip kernel_samsung_tuna-06b995be61d1352337c792e8f83048b773e32a41.tar.gz kernel_samsung_tuna-06b995be61d1352337c792e8f83048b773e32a41.tar.bz2 | |
drm/radeon/kms: Make GPU/CPU page size handling consistent in blit code (v2)
commit 003cefe0c238e683a29d2207dba945b508cd45b7 upstream.
The BO blit code inconsistenly handled the page size. This wasn't
an issue on system with 4k pages since the GPU's page size is 4k as
well. Switch the driver blit callbacks to take num pages in GPU
page units.
Fixes lemote mipsel systems using AMD rs780/rs880 chipsets.
v2: incorporate suggestions from Michel.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 60125dd..3e9b41b 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -277,7 +277,12 @@ static int radeon_move_blit(struct ttm_buffer_object *bo, DRM_ERROR("Trying to move memory with CP turned off.\n"); return -EINVAL; } - r = radeon_copy(rdev, old_start, new_start, new_mem->num_pages, fence); + + BUILD_BUG_ON((PAGE_SIZE % RADEON_GPU_PAGE_SIZE) != 0); + + r = radeon_copy(rdev, old_start, new_start, + new_mem->num_pages * (PAGE_SIZE / RADEON_GPU_PAGE_SIZE), /* GPU pages */ + fence); /* FIXME: handle copy error */ r = ttm_bo_move_accel_cleanup(bo, (void *)fence, NULL, evict, no_wait_reserve, no_wait_gpu, new_mem); |