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
125 lines
3.7 KiB
C
125 lines
3.7 KiB
C
/*
|
|
* Copyright 2011 Christian König.
|
|
* All Rights Reserved.
|
|
*
|
|
* 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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.
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial portions
|
|
* of the Software.
|
|
*
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
/*
|
|
* Authors:
|
|
* Christian König <deathsimple@vodafone.de>
|
|
*/
|
|
#include <dev/drm2/drmP.h>
|
|
#include "radeon.h"
|
|
|
|
|
|
int radeon_semaphore_create(struct radeon_device *rdev,
|
|
struct radeon_semaphore **semaphore)
|
|
{
|
|
int r;
|
|
|
|
*semaphore = malloc(sizeof(struct radeon_semaphore),
|
|
DRM_MEM_DRIVER, M_NOWAIT);
|
|
if (*semaphore == NULL) {
|
|
return -ENOMEM;
|
|
}
|
|
r = radeon_sa_bo_new(rdev, &rdev->ring_tmp_bo,
|
|
&(*semaphore)->sa_bo, 8, 8, true);
|
|
if (r) {
|
|
free(*semaphore, DRM_MEM_DRIVER);
|
|
*semaphore = NULL;
|
|
return r;
|
|
}
|
|
(*semaphore)->waiters = 0;
|
|
(*semaphore)->gpu_addr = radeon_sa_bo_gpu_addr((*semaphore)->sa_bo);
|
|
*((uint64_t*)radeon_sa_bo_cpu_addr((*semaphore)->sa_bo)) = 0;
|
|
return 0;
|
|
}
|
|
|
|
void radeon_semaphore_emit_signal(struct radeon_device *rdev, int ring,
|
|
struct radeon_semaphore *semaphore)
|
|
{
|
|
--semaphore->waiters;
|
|
radeon_semaphore_ring_emit(rdev, ring, &rdev->ring[ring], semaphore, false);
|
|
}
|
|
|
|
void radeon_semaphore_emit_wait(struct radeon_device *rdev, int ring,
|
|
struct radeon_semaphore *semaphore)
|
|
{
|
|
++semaphore->waiters;
|
|
radeon_semaphore_ring_emit(rdev, ring, &rdev->ring[ring], semaphore, true);
|
|
}
|
|
|
|
/* caller must hold ring lock */
|
|
int radeon_semaphore_sync_rings(struct radeon_device *rdev,
|
|
struct radeon_semaphore *semaphore,
|
|
int signaler, int waiter)
|
|
{
|
|
int r;
|
|
|
|
/* no need to signal and wait on the same ring */
|
|
if (signaler == waiter) {
|
|
return 0;
|
|
}
|
|
|
|
/* prevent GPU deadlocks */
|
|
if (!rdev->ring[signaler].ready) {
|
|
dev_err(rdev->dev, "Trying to sync to a disabled ring!");
|
|
return -EINVAL;
|
|
}
|
|
|
|
r = radeon_ring_alloc(rdev, &rdev->ring[signaler], 8);
|
|
if (r) {
|
|
return r;
|
|
}
|
|
radeon_semaphore_emit_signal(rdev, signaler, semaphore);
|
|
radeon_ring_commit(rdev, &rdev->ring[signaler]);
|
|
|
|
/* we assume caller has already allocated space on waiters ring */
|
|
radeon_semaphore_emit_wait(rdev, waiter, semaphore);
|
|
|
|
/* for debugging lockup only, used by sysfs debug files */
|
|
rdev->ring[signaler].last_semaphore_signal_addr = semaphore->gpu_addr;
|
|
rdev->ring[waiter].last_semaphore_wait_addr = semaphore->gpu_addr;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void radeon_semaphore_free(struct radeon_device *rdev,
|
|
struct radeon_semaphore **semaphore,
|
|
struct radeon_fence *fence)
|
|
{
|
|
if (semaphore == NULL || *semaphore == NULL) {
|
|
return;
|
|
}
|
|
if ((*semaphore)->waiters > 0) {
|
|
dev_err(rdev->dev, "semaphore %p has more waiters than signalers,"
|
|
" hardware lockup imminent!\n", *semaphore);
|
|
}
|
|
radeon_sa_bo_free(rdev, &(*semaphore)->sa_bo, fence);
|
|
free(*semaphore, DRM_MEM_DRIVER);
|
|
*semaphore = NULL;
|
|
}
|