268b2510de
We were previously dropping alignment requests on the floor when allocating buffers so we always ended up page aligned. Certain tiling modes on 6xx+ require larger alignment which wasn't happening before. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Cc: Jerome Glisse <j.glisse@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
160 lines
4.3 KiB
C
160 lines
4.3 KiB
C
/*
|
|
* Copyright 2009 Jerome Glisse.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors: Jerome Glisse
|
|
*/
|
|
#include <drm/drmP.h>
|
|
#include <drm/radeon_drm.h>
|
|
#include "radeon_reg.h"
|
|
#include "radeon.h"
|
|
|
|
void radeon_benchmark_move(struct radeon_device *rdev, unsigned bsize,
|
|
unsigned sdomain, unsigned ddomain)
|
|
{
|
|
struct radeon_bo *dobj = NULL;
|
|
struct radeon_bo *sobj = NULL;
|
|
struct radeon_fence *fence = NULL;
|
|
uint64_t saddr, daddr;
|
|
unsigned long start_jiffies;
|
|
unsigned long end_jiffies;
|
|
unsigned long time;
|
|
unsigned i, n, size;
|
|
int r;
|
|
|
|
size = bsize;
|
|
n = 1024;
|
|
r = radeon_bo_create(rdev, NULL, size, PAGE_SIZE, true, sdomain, &sobj);
|
|
if (r) {
|
|
goto out_cleanup;
|
|
}
|
|
r = radeon_bo_reserve(sobj, false);
|
|
if (unlikely(r != 0))
|
|
goto out_cleanup;
|
|
r = radeon_bo_pin(sobj, sdomain, &saddr);
|
|
radeon_bo_unreserve(sobj);
|
|
if (r) {
|
|
goto out_cleanup;
|
|
}
|
|
r = radeon_bo_create(rdev, NULL, size, PAGE_SIZE, true, ddomain, &dobj);
|
|
if (r) {
|
|
goto out_cleanup;
|
|
}
|
|
r = radeon_bo_reserve(dobj, false);
|
|
if (unlikely(r != 0))
|
|
goto out_cleanup;
|
|
r = radeon_bo_pin(dobj, ddomain, &daddr);
|
|
radeon_bo_unreserve(dobj);
|
|
if (r) {
|
|
goto out_cleanup;
|
|
}
|
|
|
|
/* r100 doesn't have dma engine so skip the test */
|
|
if (rdev->asic->copy_dma) {
|
|
|
|
start_jiffies = jiffies;
|
|
for (i = 0; i < n; i++) {
|
|
r = radeon_fence_create(rdev, &fence);
|
|
if (r) {
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_copy_dma(rdev, saddr, daddr,
|
|
size / RADEON_GPU_PAGE_SIZE, fence);
|
|
|
|
if (r) {
|
|
goto out_cleanup;
|
|
}
|
|
r = radeon_fence_wait(fence, false);
|
|
if (r) {
|
|
goto out_cleanup;
|
|
}
|
|
radeon_fence_unref(&fence);
|
|
}
|
|
end_jiffies = jiffies;
|
|
time = end_jiffies - start_jiffies;
|
|
time = jiffies_to_msecs(time);
|
|
if (time > 0) {
|
|
i = ((n * size) >> 10) / time;
|
|
printk(KERN_INFO "radeon: dma %u bo moves of %ukb from"
|
|
" %d to %d in %lums (%ukb/ms %ukb/s %uM/s)\n",
|
|
n, size >> 10,
|
|
sdomain, ddomain, time,
|
|
i, i * 1000, (i * 1000) / 1024);
|
|
}
|
|
}
|
|
|
|
start_jiffies = jiffies;
|
|
for (i = 0; i < n; i++) {
|
|
r = radeon_fence_create(rdev, &fence);
|
|
if (r) {
|
|
goto out_cleanup;
|
|
}
|
|
r = radeon_copy_blit(rdev, saddr, daddr, size / RADEON_GPU_PAGE_SIZE, fence);
|
|
if (r) {
|
|
goto out_cleanup;
|
|
}
|
|
r = radeon_fence_wait(fence, false);
|
|
if (r) {
|
|
goto out_cleanup;
|
|
}
|
|
radeon_fence_unref(&fence);
|
|
}
|
|
end_jiffies = jiffies;
|
|
time = end_jiffies - start_jiffies;
|
|
time = jiffies_to_msecs(time);
|
|
if (time > 0) {
|
|
i = ((n * size) >> 10) / time;
|
|
printk(KERN_INFO "radeon: blit %u bo moves of %ukb from %d to %d"
|
|
" in %lums (%ukb/ms %ukb/s %uM/s)\n", n, size >> 10,
|
|
sdomain, ddomain, time, i, i * 1000, (i * 1000) / 1024);
|
|
}
|
|
out_cleanup:
|
|
if (sobj) {
|
|
r = radeon_bo_reserve(sobj, false);
|
|
if (likely(r == 0)) {
|
|
radeon_bo_unpin(sobj);
|
|
radeon_bo_unreserve(sobj);
|
|
}
|
|
radeon_bo_unref(&sobj);
|
|
}
|
|
if (dobj) {
|
|
r = radeon_bo_reserve(dobj, false);
|
|
if (likely(r == 0)) {
|
|
radeon_bo_unpin(dobj);
|
|
radeon_bo_unreserve(dobj);
|
|
}
|
|
radeon_bo_unref(&dobj);
|
|
}
|
|
if (fence) {
|
|
radeon_fence_unref(&fence);
|
|
}
|
|
if (r) {
|
|
printk(KERN_WARNING "Error while benchmarking BO move.\n");
|
|
}
|
|
}
|
|
|
|
void radeon_benchmark(struct radeon_device *rdev)
|
|
{
|
|
radeon_benchmark_move(rdev, 1024*1024, RADEON_GEM_DOMAIN_GTT,
|
|
RADEON_GEM_DOMAIN_VRAM);
|
|
radeon_benchmark_move(rdev, 1024*1024, RADEON_GEM_DOMAIN_VRAM,
|
|
RADEON_GEM_DOMAIN_GTT);
|
|
}
|