diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-07-30 00:41:16 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-07-30 00:41:16 +0100 |
| commit | 6a86258bb9dbda75dfbf6610b12fc1442b0fa7ba (patch) | |
| tree | 14887f0fa683e9f572bc6aec7129e375316b3baf /src | |
| parent | 924cd7045c6d520fbd25da05440960143e958a2d (diff) | |
Use proper types for cmdq submission
Diffstat (limited to 'src')
| -rw-r--r-- | src/glamo-drm-cmdq.h | 4 | ||||
| -rw-r--r-- | src/glamo-kms-exa.c | 4 | ||||
| -rw-r--r-- | src/glamo.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/glamo-drm-cmdq.h b/src/glamo-drm-cmdq.h index 85df1c0..79bc512 100644 --- a/src/glamo-drm-cmdq.h +++ b/src/glamo-drm-cmdq.h @@ -31,7 +31,7 @@ #if !CCE_DEBUG #define RING_LOCALS CARD16 *__head; int __count; int __objects; \ - char *__objs; char *__obj_pos; + uint32_t *__objs; unsigned int *__obj_pos; #define BEGIN_CMDQ(n) \ do { \ @@ -64,7 +64,7 @@ do { \ #define RING_LOCALS \ CARD16 *__head; int __count, __total, __reg, __packet0count; \ - int __objects; char *__objs; char *__obj_pos; + int __objects; uint32_t *__objs; unsigned int *__obj_pos; #define BEGIN_CMDQ(n) \ do { \ diff --git a/src/glamo-kms-exa.c b/src/glamo-kms-exa.c index 4e0f213..c911f2c 100644 --- a/src/glamo-kms-exa.c +++ b/src/glamo-kms-exa.c @@ -129,7 +129,7 @@ void GlamoDRMDispatch(GlamoPtr pGlamo) cmdbuf.bufsz = pGlamo->cmd_queue->used; cmdbuf.nobjs = pGlamo->cmdq_obj_used; cmdbuf.objs = (uint32_t *)pGlamo->cmdq_objs; - cmdbuf.obj_pos = (int *)pGlamo->cmdq_obj_pos; + cmdbuf.obj_pos = pGlamo->cmdq_obj_pos; r = drmCommandWrite(pGlamo->drm_fd, DRM_GLAMO_CMDBUF, &cmdbuf, sizeof(cmdbuf)); @@ -445,7 +445,7 @@ static Bool GlamoKMSExaPrepareAccess(PixmapPtr pPix, int index) "%s: bo map failed\n", __FUNCTION__); return FALSE; } - pPix->devPrivate.ptr = driver_priv->bo->ptr; + pPix->devPrivate.ptr = driver_priv->bo->virtual; return TRUE; } diff --git a/src/glamo.h b/src/glamo.h index d802226..be4a1dc 100644 --- a/src/glamo.h +++ b/src/glamo.h @@ -107,8 +107,8 @@ typedef struct { */ MemBuf *cmd_queue; int cmdq_obj_used; - char *cmdq_objs; - char *cmdq_obj_pos; + uint32_t *cmdq_objs; + unsigned int *cmdq_obj_pos; /* What was GLAMOCardInfo */ volatile char *reg_base; |