4cd2e9581f
This reverts a private patch which is causing issues with many Intel chipsets. I will review that patch and see what we need to do to fix it up later, but for the time being, we will just get these chips working again. This update contains a lot of code cleanup and is post gem merge (no, we don't have gem support). It should prove much easier to read the code now. A lot of thanks goes to vehemens for that work. I have adapted the code to use cdevpriv for tracking per open file data. That alleviates the old ugly hack that we used to try and accomplish the task and helped to clean up the open / close behavior a good bit. This also replaces the hack that was put in place a year or so ago to prevent radeons from locking up with AIGLX enabled. I have had a couple of radeon testers report that it still works as expected, though I no longer have radeon hardware to test with myself. Other various fixes from the linux crew and Intel, many of which are muddled in with the gem merge. Approved by: jhb (mentor) Obtained from: mesa/drm git master MFC after: 2 weeks
92 lines
2.5 KiB
C
92 lines
2.5 KiB
C
/**
|
|
* \file drm_atomic.h
|
|
* Atomic operations used in the DRM which may or may not be provided by the OS.
|
|
*
|
|
* \author Eric Anholt <anholt@FreeBSD.org>
|
|
*/
|
|
|
|
/*-
|
|
* Copyright 2004 Eric Anholt
|
|
* 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, 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 (including the next
|
|
* paragraph) 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
|
|
* VA LINUX SYSTEMS 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.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
/* Many of these implementations are rather fake, but good enough. */
|
|
|
|
typedef u_int32_t atomic_t;
|
|
|
|
#define atomic_set(p, v) (*(p) = (v))
|
|
#define atomic_read(p) (*(p))
|
|
#define atomic_inc(p) atomic_add_int(p, 1)
|
|
#define atomic_dec(p) atomic_subtract_int(p, 1)
|
|
#define atomic_add(n, p) atomic_add_int(p, n)
|
|
#define atomic_sub(n, p) atomic_subtract_int(p, n)
|
|
|
|
static __inline atomic_t
|
|
test_and_set_bit(int b, volatile void *p)
|
|
{
|
|
int s = splhigh();
|
|
unsigned int m = 1<<b;
|
|
unsigned int r = *(volatile int *)p & m;
|
|
*(volatile int *)p |= m;
|
|
splx(s);
|
|
return r;
|
|
}
|
|
|
|
static __inline void
|
|
clear_bit(int b, volatile void *p)
|
|
{
|
|
atomic_clear_int(((volatile int *)p) + (b >> 5), 1 << (b & 0x1f));
|
|
}
|
|
|
|
static __inline void
|
|
set_bit(int b, volatile void *p)
|
|
{
|
|
atomic_set_int(((volatile int *)p) + (b >> 5), 1 << (b & 0x1f));
|
|
}
|
|
|
|
static __inline int
|
|
test_bit(int b, volatile void *p)
|
|
{
|
|
return ((volatile int *)p)[b >> 5] & (1 << (b & 0x1f));
|
|
}
|
|
|
|
static __inline int
|
|
find_first_zero_bit(volatile void *p, int max)
|
|
{
|
|
int b;
|
|
volatile int *ptr = (volatile int *)p;
|
|
|
|
for (b = 0; b < max; b += 32) {
|
|
if (ptr[b >> 5] != ~0) {
|
|
for (;;) {
|
|
if ((ptr[b >> 5] & (1 << (b & 0x1f))) == 0)
|
|
return b;
|
|
b++;
|
|
}
|
|
}
|
|
}
|
|
return max;
|
|
}
|