summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2009-09-14 22:36:31 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-02-18 15:39:23 +0100
commit23dc18e0dae0649d9ddc13092d9ab3b77059bc10 (patch)
tree860c505bdbd14088221d52205087ca1366b56423
parentbd53e5ac969ef8dabf299eb0394f80ed279c471c (diff)
CmdQ fixes
-rw-r--r--src/mesa/drivers/dri/glamo/glamo_cmdq.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/glamo/glamo_cmdq.c b/src/mesa/drivers/dri/glamo/glamo_cmdq.c
index f6052e9783..0973b5fd5c 100644
--- a/src/mesa/drivers/dri/glamo/glamo_cmdq.c
+++ b/src/mesa/drivers/dri/glamo/glamo_cmdq.c
@@ -21,6 +21,7 @@
#include <stdint.h>
+#include <drm.h>
#include <glamo_bo.h>
#include "glamo_context.h"
@@ -41,8 +42,7 @@ void GlamoDRMDispatch(glamoContext *gCtx)
r = drmCommandWrite(gCtx->drm_fd, DRM_GLAMO_CMDBUF,
&cmdbuf, sizeof(cmdbuf));
if ( r != 0 ) {
- xf86DrvMsg(gCtx->pScreen->myNum, X_ERROR,
- "DRM_GLAMO_CMDBUF failed\n");
+ fprintf(stderr, "DRM_GLAMO_CMDBUF failed\n");
}
/* Reset counts to zero for the next sequence */
@@ -55,8 +55,6 @@ void GlamoDRMAddCommand(glamoContext *gCtx, uint16_t reg,
uint16_t val)
{
if ( gCtx->cmdq_drm_used == gCtx->cmdq_drm_size ) {
- xf86DrvMsg(gCtx->pScreen->myNum, X_INFO,
- "Forced command cache flush.\n");
GlamoDRMDispatch(gCtx);
}
@@ -70,8 +68,6 @@ void GlamoDRMAddCommandBO(glamoContext *gCtx, uint16_t reg,
struct glamo_bo *bo)
{
if ( gCtx->cmdq_drm_used == gCtx->cmdq_drm_size ) {
- xf86DrvMsg(gCtx->pScreen->myNum, X_INFO,
- "Forced command cache flush.\n");
GlamoDRMDispatch(gCtx);
}
@@ -86,8 +82,6 @@ void GlamoDRMAddCommandBO(glamoContext *gCtx, uint16_t reg,
gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = 0x0000;
gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = reg+2;
gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = 0x0000;
-
- gCtx->last_buffer_object = bo;
}