AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

drm/radeon: Skip dma copy test in benchmark if card doesn't have dma engine.

Browse Source 
radeon_copy_dma is only available for r200 or newer cards.
Call to radeon_copy_dma would result to NULL pointer
dereference if benchmarking asic without dma engine.

Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Pauli Nieminen 2010-02-11 00:10:33 +02:00 committed by Dave Airlie
parent 6719fc663c
commit c60a284cc4
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/radeon/radeon_benchmark.c
View File

@ -65,13 +65,20 @@ void radeon_benchmark_move(struct radeon_device *rdev, unsigned bsize,
if (r) { if (r) {
goto out_cleanup; goto out_cleanup;
} }
/* r100 doesn't have dma engine so skip the test */
if (rdev->asic->copy_dma) {
start_jiffies = jiffies; start_jiffies = jiffies;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
r = radeon_fence_create(rdev, &fence); r = radeon_fence_create(rdev, &fence);
if (r) { if (r) {
goto out_cleanup; goto out_cleanup;
} }
r = radeon_copy_dma(rdev, saddr, daddr, size / RADEON_GPU_PAGE_SIZE, fence);
r = radeon_copy_dma(rdev, saddr, daddr,
size / RADEON_GPU_PAGE_SIZE, fence);
if (r) { if (r) {
goto out_cleanup; goto out_cleanup;
} }
@ -86,10 +93,14 @@ void radeon_benchmark_move(struct radeon_device *rdev, unsigned bsize,
time = jiffies_to_msecs(time); time = jiffies_to_msecs(time);
if (time > 0) { if (time > 0) {
i = ((n * size) >> 10) / time; i = ((n * size) >> 10) / time;
printk(KERN_INFO "radeon: dma %u bo moves of %ukb from %d to %d" printk(KERN_INFO "radeon: dma %u bo moves of %ukb from"
" in %lums (%ukb/ms %ukb/s %uM/s)\n", n, size >> 10, " %d to %d in %lums (%ukb/ms %ukb/s %uM/s)\n",
sdomain, ddomain, time, i, i * 1000, (i * 1000) / 1024); n, size >> 10,
sdomain, ddomain, time,
i, i * 1000, (i * 1000) / 1024);
} }
}
start_jiffies = jiffies; start_jiffies = jiffies;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
r = radeon_fence_create(rdev, &fence); r = radeon_fence_create(rdev, &fence);