455fa6518a
This update brings few features:
o Support for the setmaster/dropmaster ioctls. For instance, they
are used to run multiple X servers simultaneously.
o Support for minor devices. The only user-visible change is a new
entry in /dev/dri but it is useless at the moment. This is a
first step to support render nodes [1].
The main benefit is to greatly reduce the diff with Linux (at the
expense of an unreadable commit diff). Hopefully, next upgrades will be
easier.
No updates were made to the drivers, beside adapting them to API
changes.
[1] https://en.wikipedia.org/wiki/Direct_Rendering_Manager#Render_nodes
Tested by: Many people
MFC after: 1 month
Relnotes: yes
510 lines
14 KiB
C
510 lines
14 KiB
C
/*
|
|
* Copyright 2009 VMware, Inc.
|
|
*
|
|
* 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: Michel Dänzer
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <dev/drm2/drmP.h>
|
|
#include <dev/drm2/radeon/radeon_drm.h>
|
|
#include "radeon_reg.h"
|
|
#include "radeon.h"
|
|
|
|
#define RADEON_TEST_COPY_BLIT 1
|
|
#define RADEON_TEST_COPY_DMA 0
|
|
|
|
|
|
/* Test BO GTT->VRAM and VRAM->GTT GPU copies across the whole GTT aperture */
|
|
static void radeon_do_test_moves(struct radeon_device *rdev, int flag)
|
|
{
|
|
struct radeon_bo *vram_obj = NULL;
|
|
struct radeon_bo **gtt_obj = NULL;
|
|
struct radeon_fence *fence = NULL;
|
|
uint64_t gtt_addr, vram_addr;
|
|
unsigned i, n, size;
|
|
int r, ring;
|
|
|
|
switch (flag) {
|
|
case RADEON_TEST_COPY_DMA:
|
|
ring = radeon_copy_dma_ring_index(rdev);
|
|
break;
|
|
case RADEON_TEST_COPY_BLIT:
|
|
ring = radeon_copy_blit_ring_index(rdev);
|
|
break;
|
|
default:
|
|
DRM_ERROR("Unknown copy method\n");
|
|
return;
|
|
}
|
|
|
|
size = 1024 * 1024;
|
|
|
|
/* Number of tests =
|
|
* (Total GTT - IB pool - writeback page - ring buffers) / test size
|
|
*/
|
|
n = rdev->mc.gtt_size - RADEON_IB_POOL_SIZE*64*1024;
|
|
for (i = 0; i < RADEON_NUM_RINGS; ++i)
|
|
n -= rdev->ring[i].ring_size;
|
|
if (rdev->wb.wb_obj)
|
|
n -= RADEON_GPU_PAGE_SIZE;
|
|
if (rdev->ih.ring_obj)
|
|
n -= rdev->ih.ring_size;
|
|
n /= size;
|
|
|
|
gtt_obj = malloc(n * sizeof(*gtt_obj), DRM_MEM_DRIVER, M_NOWAIT | M_ZERO);
|
|
if (!gtt_obj) {
|
|
DRM_ERROR("Failed to allocate %d pointers\n", n);
|
|
r = 1;
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_bo_create(rdev, size, PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,
|
|
NULL, &vram_obj);
|
|
if (r) {
|
|
DRM_ERROR("Failed to create VRAM object\n");
|
|
goto out_cleanup;
|
|
}
|
|
r = radeon_bo_reserve(vram_obj, false);
|
|
if (unlikely(r != 0))
|
|
goto out_cleanup;
|
|
r = radeon_bo_pin(vram_obj, RADEON_GEM_DOMAIN_VRAM, &vram_addr);
|
|
if (r) {
|
|
DRM_ERROR("Failed to pin VRAM object\n");
|
|
goto out_cleanup;
|
|
}
|
|
for (i = 0; i < n; i++) {
|
|
void *gtt_map, *vram_map;
|
|
void **gtt_start, **gtt_end;
|
|
void **vram_start, **vram_end;
|
|
|
|
r = radeon_bo_create(rdev, size, PAGE_SIZE, true,
|
|
RADEON_GEM_DOMAIN_GTT, NULL, gtt_obj + i);
|
|
if (r) {
|
|
DRM_ERROR("Failed to create GTT object %d\n", i);
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_bo_reserve(gtt_obj[i], false);
|
|
if (unlikely(r != 0))
|
|
goto out_cleanup;
|
|
r = radeon_bo_pin(gtt_obj[i], RADEON_GEM_DOMAIN_GTT, >t_addr);
|
|
if (r) {
|
|
DRM_ERROR("Failed to pin GTT object %d\n", i);
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_bo_kmap(gtt_obj[i], >t_map);
|
|
if (r) {
|
|
DRM_ERROR("Failed to map GTT object %d\n", i);
|
|
goto out_cleanup;
|
|
}
|
|
|
|
for (gtt_start = gtt_map, gtt_end = (void *)((uintptr_t)gtt_map + size);
|
|
gtt_start < gtt_end;
|
|
gtt_start++)
|
|
*gtt_start = gtt_start;
|
|
|
|
radeon_bo_kunmap(gtt_obj[i]);
|
|
|
|
if (ring == R600_RING_TYPE_DMA_INDEX)
|
|
r = radeon_copy_dma(rdev, gtt_addr, vram_addr, size / RADEON_GPU_PAGE_SIZE, &fence);
|
|
else
|
|
r = radeon_copy_blit(rdev, gtt_addr, vram_addr, size / RADEON_GPU_PAGE_SIZE, &fence);
|
|
if (r) {
|
|
DRM_ERROR("Failed GTT->VRAM copy %d\n", i);
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_fence_wait(fence, false);
|
|
if (r) {
|
|
DRM_ERROR("Failed to wait for GTT->VRAM fence %d\n", i);
|
|
goto out_cleanup;
|
|
}
|
|
|
|
radeon_fence_unref(&fence);
|
|
|
|
r = radeon_bo_kmap(vram_obj, &vram_map);
|
|
if (r) {
|
|
DRM_ERROR("Failed to map VRAM object after copy %d\n", i);
|
|
goto out_cleanup;
|
|
}
|
|
|
|
for (gtt_start = gtt_map, gtt_end = (void *)((uintptr_t)gtt_map + size),
|
|
vram_start = vram_map, vram_end = (void *)((uintptr_t)vram_map + size);
|
|
vram_start < vram_end;
|
|
gtt_start++, vram_start++) {
|
|
if (*vram_start != gtt_start) {
|
|
DRM_ERROR("Incorrect GTT->VRAM copy %d: Got 0x%p, "
|
|
"expected 0x%p (GTT/VRAM offset "
|
|
"0x%16llx/0x%16llx)\n",
|
|
i, *vram_start, gtt_start,
|
|
(unsigned long long)
|
|
((uintptr_t)gtt_addr - (uintptr_t)rdev->mc.gtt_start +
|
|
(uintptr_t)gtt_start - (uintptr_t)gtt_map),
|
|
(unsigned long long)
|
|
((uintptr_t)vram_addr - (uintptr_t)rdev->mc.vram_start +
|
|
(uintptr_t)gtt_start - (uintptr_t)gtt_map));
|
|
radeon_bo_kunmap(vram_obj);
|
|
goto out_cleanup;
|
|
}
|
|
*vram_start = vram_start;
|
|
}
|
|
|
|
radeon_bo_kunmap(vram_obj);
|
|
|
|
if (ring == R600_RING_TYPE_DMA_INDEX)
|
|
r = radeon_copy_dma(rdev, vram_addr, gtt_addr, size / RADEON_GPU_PAGE_SIZE, &fence);
|
|
else
|
|
r = radeon_copy_blit(rdev, vram_addr, gtt_addr, size / RADEON_GPU_PAGE_SIZE, &fence);
|
|
if (r) {
|
|
DRM_ERROR("Failed VRAM->GTT copy %d\n", i);
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_fence_wait(fence, false);
|
|
if (r) {
|
|
DRM_ERROR("Failed to wait for VRAM->GTT fence %d\n", i);
|
|
goto out_cleanup;
|
|
}
|
|
|
|
radeon_fence_unref(&fence);
|
|
|
|
r = radeon_bo_kmap(gtt_obj[i], >t_map);
|
|
if (r) {
|
|
DRM_ERROR("Failed to map GTT object after copy %d\n", i);
|
|
goto out_cleanup;
|
|
}
|
|
|
|
for (gtt_start = gtt_map, gtt_end = (void *)((uintptr_t)gtt_map + size),
|
|
vram_start = vram_map, vram_end = (void *)((uintptr_t)vram_map + size);
|
|
gtt_start < gtt_end;
|
|
gtt_start++, vram_start++) {
|
|
if (*gtt_start != vram_start) {
|
|
DRM_ERROR("Incorrect VRAM->GTT copy %d: Got 0x%p, "
|
|
"expected 0x%p (VRAM/GTT offset "
|
|
"0x%16llx/0x%16llx)\n",
|
|
i, *gtt_start, vram_start,
|
|
(unsigned long long)
|
|
((uintptr_t)vram_addr - (uintptr_t)rdev->mc.vram_start +
|
|
(uintptr_t)vram_start - (uintptr_t)vram_map),
|
|
(unsigned long long)
|
|
((uintptr_t)gtt_addr - (uintptr_t)rdev->mc.gtt_start +
|
|
(uintptr_t)vram_start - (uintptr_t)vram_map));
|
|
radeon_bo_kunmap(gtt_obj[i]);
|
|
goto out_cleanup;
|
|
}
|
|
}
|
|
|
|
radeon_bo_kunmap(gtt_obj[i]);
|
|
|
|
DRM_INFO("Tested GTT->VRAM and VRAM->GTT copy for GTT offset 0x%jx\n",
|
|
(uintmax_t)gtt_addr - rdev->mc.gtt_start);
|
|
}
|
|
|
|
out_cleanup:
|
|
if (vram_obj) {
|
|
if (radeon_bo_is_reserved(vram_obj)) {
|
|
radeon_bo_unpin(vram_obj);
|
|
radeon_bo_unreserve(vram_obj);
|
|
}
|
|
radeon_bo_unref(&vram_obj);
|
|
}
|
|
if (gtt_obj) {
|
|
for (i = 0; i < n; i++) {
|
|
if (gtt_obj[i]) {
|
|
if (radeon_bo_is_reserved(gtt_obj[i])) {
|
|
radeon_bo_unpin(gtt_obj[i]);
|
|
radeon_bo_unreserve(gtt_obj[i]);
|
|
}
|
|
radeon_bo_unref(>t_obj[i]);
|
|
}
|
|
}
|
|
free(gtt_obj, DRM_MEM_DRIVER);
|
|
}
|
|
if (fence) {
|
|
radeon_fence_unref(&fence);
|
|
}
|
|
if (r) {
|
|
DRM_ERROR("Error while testing BO move.\n");
|
|
}
|
|
}
|
|
|
|
void radeon_test_moves(struct radeon_device *rdev)
|
|
{
|
|
if (rdev->asic->copy.dma)
|
|
radeon_do_test_moves(rdev, RADEON_TEST_COPY_DMA);
|
|
if (rdev->asic->copy.blit)
|
|
radeon_do_test_moves(rdev, RADEON_TEST_COPY_BLIT);
|
|
}
|
|
|
|
void radeon_test_ring_sync(struct radeon_device *rdev,
|
|
struct radeon_ring *ringA,
|
|
struct radeon_ring *ringB)
|
|
{
|
|
struct radeon_fence *fence1 = NULL, *fence2 = NULL;
|
|
struct radeon_semaphore *semaphore = NULL;
|
|
int r;
|
|
|
|
r = radeon_semaphore_create(rdev, &semaphore);
|
|
if (r) {
|
|
DRM_ERROR("Failed to create semaphore\n");
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_ring_lock(rdev, ringA, 64);
|
|
if (r) {
|
|
DRM_ERROR("Failed to lock ring A %d\n", ringA->idx);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_semaphore_emit_wait(rdev, ringA->idx, semaphore);
|
|
r = radeon_fence_emit(rdev, &fence1, ringA->idx);
|
|
if (r) {
|
|
DRM_ERROR("Failed to emit fence 1\n");
|
|
radeon_ring_unlock_undo(rdev, ringA);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_semaphore_emit_wait(rdev, ringA->idx, semaphore);
|
|
r = radeon_fence_emit(rdev, &fence2, ringA->idx);
|
|
if (r) {
|
|
DRM_ERROR("Failed to emit fence 2\n");
|
|
radeon_ring_unlock_undo(rdev, ringA);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_ring_unlock_commit(rdev, ringA);
|
|
|
|
mdelay(1000);
|
|
|
|
if (radeon_fence_signaled(fence1)) {
|
|
DRM_ERROR("Fence 1 signaled without waiting for semaphore.\n");
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_ring_lock(rdev, ringB, 64);
|
|
if (r) {
|
|
DRM_ERROR("Failed to lock ring B %p\n", ringB);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_semaphore_emit_signal(rdev, ringB->idx, semaphore);
|
|
radeon_ring_unlock_commit(rdev, ringB);
|
|
|
|
r = radeon_fence_wait(fence1, false);
|
|
if (r) {
|
|
DRM_ERROR("Failed to wait for sync fence 1\n");
|
|
goto out_cleanup;
|
|
}
|
|
|
|
mdelay(1000);
|
|
|
|
if (radeon_fence_signaled(fence2)) {
|
|
DRM_ERROR("Fence 2 signaled without waiting for semaphore.\n");
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_ring_lock(rdev, ringB, 64);
|
|
if (r) {
|
|
DRM_ERROR("Failed to lock ring B %p\n", ringB);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_semaphore_emit_signal(rdev, ringB->idx, semaphore);
|
|
radeon_ring_unlock_commit(rdev, ringB);
|
|
|
|
r = radeon_fence_wait(fence2, false);
|
|
if (r) {
|
|
DRM_ERROR("Failed to wait for sync fence 1\n");
|
|
goto out_cleanup;
|
|
}
|
|
|
|
out_cleanup:
|
|
radeon_semaphore_free(rdev, &semaphore, NULL);
|
|
|
|
if (fence1)
|
|
radeon_fence_unref(&fence1);
|
|
|
|
if (fence2)
|
|
radeon_fence_unref(&fence2);
|
|
|
|
if (r)
|
|
DRM_ERROR("Error while testing ring sync (%d).\n", r);
|
|
}
|
|
|
|
static void radeon_test_ring_sync2(struct radeon_device *rdev,
|
|
struct radeon_ring *ringA,
|
|
struct radeon_ring *ringB,
|
|
struct radeon_ring *ringC)
|
|
{
|
|
struct radeon_fence *fenceA = NULL, *fenceB = NULL;
|
|
struct radeon_semaphore *semaphore = NULL;
|
|
bool sigA, sigB;
|
|
int i, r;
|
|
|
|
r = radeon_semaphore_create(rdev, &semaphore);
|
|
if (r) {
|
|
DRM_ERROR("Failed to create semaphore\n");
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_ring_lock(rdev, ringA, 64);
|
|
if (r) {
|
|
DRM_ERROR("Failed to lock ring A %d\n", ringA->idx);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_semaphore_emit_wait(rdev, ringA->idx, semaphore);
|
|
r = radeon_fence_emit(rdev, &fenceA, ringA->idx);
|
|
if (r) {
|
|
DRM_ERROR("Failed to emit sync fence 1\n");
|
|
radeon_ring_unlock_undo(rdev, ringA);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_ring_unlock_commit(rdev, ringA);
|
|
|
|
r = radeon_ring_lock(rdev, ringB, 64);
|
|
if (r) {
|
|
DRM_ERROR("Failed to lock ring B %d\n", ringB->idx);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_semaphore_emit_wait(rdev, ringB->idx, semaphore);
|
|
r = radeon_fence_emit(rdev, &fenceB, ringB->idx);
|
|
if (r) {
|
|
DRM_ERROR("Failed to create sync fence 2\n");
|
|
radeon_ring_unlock_undo(rdev, ringB);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_ring_unlock_commit(rdev, ringB);
|
|
|
|
mdelay(1000);
|
|
|
|
if (radeon_fence_signaled(fenceA)) {
|
|
DRM_ERROR("Fence A signaled without waiting for semaphore.\n");
|
|
goto out_cleanup;
|
|
}
|
|
if (radeon_fence_signaled(fenceB)) {
|
|
DRM_ERROR("Fence A signaled without waiting for semaphore.\n");
|
|
goto out_cleanup;
|
|
}
|
|
|
|
r = radeon_ring_lock(rdev, ringC, 64);
|
|
if (r) {
|
|
DRM_ERROR("Failed to lock ring B %p\n", ringC);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_semaphore_emit_signal(rdev, ringC->idx, semaphore);
|
|
radeon_ring_unlock_commit(rdev, ringC);
|
|
|
|
for (i = 0; i < 30; ++i) {
|
|
mdelay(100);
|
|
sigA = radeon_fence_signaled(fenceA);
|
|
sigB = radeon_fence_signaled(fenceB);
|
|
if (sigA || sigB)
|
|
break;
|
|
}
|
|
|
|
if (!sigA && !sigB) {
|
|
DRM_ERROR("Neither fence A nor B has been signaled\n");
|
|
goto out_cleanup;
|
|
} else if (sigA && sigB) {
|
|
DRM_ERROR("Both fence A and B has been signaled\n");
|
|
goto out_cleanup;
|
|
}
|
|
|
|
DRM_INFO("Fence %c was first signaled\n", sigA ? 'A' : 'B');
|
|
|
|
r = radeon_ring_lock(rdev, ringC, 64);
|
|
if (r) {
|
|
DRM_ERROR("Failed to lock ring B %p\n", ringC);
|
|
goto out_cleanup;
|
|
}
|
|
radeon_semaphore_emit_signal(rdev, ringC->idx, semaphore);
|
|
radeon_ring_unlock_commit(rdev, ringC);
|
|
|
|
mdelay(1000);
|
|
|
|
r = radeon_fence_wait(fenceA, false);
|
|
if (r) {
|
|
DRM_ERROR("Failed to wait for sync fence A\n");
|
|
goto out_cleanup;
|
|
}
|
|
r = radeon_fence_wait(fenceB, false);
|
|
if (r) {
|
|
DRM_ERROR("Failed to wait for sync fence B\n");
|
|
goto out_cleanup;
|
|
}
|
|
|
|
out_cleanup:
|
|
radeon_semaphore_free(rdev, &semaphore, NULL);
|
|
|
|
if (fenceA)
|
|
radeon_fence_unref(&fenceA);
|
|
|
|
if (fenceB)
|
|
radeon_fence_unref(&fenceB);
|
|
|
|
if (r)
|
|
DRM_ERROR("Error while testing ring sync (%d).\n", r);
|
|
}
|
|
|
|
void radeon_test_syncing(struct radeon_device *rdev)
|
|
{
|
|
int i, j, k;
|
|
|
|
for (i = 1; i < RADEON_NUM_RINGS; ++i) {
|
|
struct radeon_ring *ringA = &rdev->ring[i];
|
|
if (!ringA->ready)
|
|
continue;
|
|
|
|
for (j = 0; j < i; ++j) {
|
|
struct radeon_ring *ringB = &rdev->ring[j];
|
|
if (!ringB->ready)
|
|
continue;
|
|
|
|
DRM_INFO("Testing syncing between rings %d and %d...\n", i, j);
|
|
radeon_test_ring_sync(rdev, ringA, ringB);
|
|
|
|
DRM_INFO("Testing syncing between rings %d and %d...\n", j, i);
|
|
radeon_test_ring_sync(rdev, ringB, ringA);
|
|
|
|
for (k = 0; k < j; ++k) {
|
|
struct radeon_ring *ringC = &rdev->ring[k];
|
|
if (!ringC->ready)
|
|
continue;
|
|
|
|
DRM_INFO("Testing syncing between rings %d, %d and %d...\n", i, j, k);
|
|
radeon_test_ring_sync2(rdev, ringA, ringB, ringC);
|
|
|
|
DRM_INFO("Testing syncing between rings %d, %d and %d...\n", i, k, j);
|
|
radeon_test_ring_sync2(rdev, ringA, ringC, ringB);
|
|
|
|
DRM_INFO("Testing syncing between rings %d, %d and %d...\n", j, i, k);
|
|
radeon_test_ring_sync2(rdev, ringB, ringA, ringC);
|
|
|
|
DRM_INFO("Testing syncing between rings %d, %d and %d...\n", j, k, i);
|
|
radeon_test_ring_sync2(rdev, ringB, ringC, ringA);
|
|
|
|
DRM_INFO("Testing syncing between rings %d, %d and %d...\n", k, i, j);
|
|
radeon_test_ring_sync2(rdev, ringC, ringA, ringB);
|
|
|
|
DRM_INFO("Testing syncing between rings %d, %d and %d...\n", k, j, i);
|
|
radeon_test_ring_sync2(rdev, ringC, ringB, ringA);
|
|
}
|
|
}
|
|
}
|
|
}
|