diff options
author | Pauli Nieminen <suokkos@gmail.com> | 2009-08-24 00:57:05 +0300 |
---|---|---|
committer | Pauli Nieminen <suokkos@gmail.com> | 2009-08-24 00:57:05 +0300 |
commit | 7bb0f880dbdee0c57693c3a1f331d7c0894e71e1 (patch) | |
tree | c46a42d33501c1a9d56596981f50ce98746aa040 /src/mesa/drivers/dri/radeon/radeon_dma.c | |
parent | effda2e2a7f8ef7406d698c6b31dbbff408ed112 (diff) | |
parent | 4484ce9c7b196a686a3928f7e29dc8d9b6f3cae3 (diff) | |
download | external_mesa3d-7bb0f880dbdee0c57693c3a1f331d7c0894e71e1.zip external_mesa3d-7bb0f880dbdee0c57693c3a1f331d7c0894e71e1.tar.gz external_mesa3d-7bb0f880dbdee0c57693c3a1f331d7c0894e71e1.tar.bz2 |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_dma.c')
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_dma.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c index 7e8f50e..f306bef 100644 --- a/src/mesa/drivers/dri/radeon/radeon_dma.c +++ b/src/mesa/drivers/dri/radeon/radeon_dma.c @@ -30,6 +30,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ +#include <errno.h> #include "radeon_common.h" #include "main/simple_list.h" @@ -302,7 +303,13 @@ void radeonReturnDmaRegion(radeonContextPtr rmesa, int return_bytes) static int radeon_bo_is_idle(struct radeon_bo* bo) { - return bo->cref == 1; + uint32_t domain; + int ret = radeon_bo_is_busy(bo, &domain); + if (ret == -EINVAL) { + WARN_ONCE("Your libdrm or kernel doesn't have support for busy query.\n" + "This may cause small performance drop for you.\n"); + } + return ret != -EBUSY; } void radeonReleaseDmaRegions(radeonContextPtr rmesa) |