diff options
| author | Marek Olšák <[email protected]> | 2011-08-04 06:33:04 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-08-16 09:15:11 +0200 |
| commit | 0bbbd82488c11710aaca79ed3db2b605888ac65d (patch) | |
| tree | 9a954293da4e2793af85b55ef365ba6b000b80ad /src | |
| parent | d6da5185f96c1a85390e08dc2ef36c04d6e0de11 (diff) | |
r600g: undefine RADEON_CTX_MAX_PM4
winsys/radeon has its own definition.
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/r600/r600.h | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/r600/drm/evergreen_hw_context.c | 6 | ||||
| -rw-r--r-- | src/gallium/winsys/r600/drm/r600_hw_context.c | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h index b5d2d74628a..232912f914d 100644 --- a/src/gallium/drivers/r600/r600.h +++ b/src/gallium/drivers/r600/r600.h @@ -29,8 +29,6 @@ #include "util/u_double_list.h" #include "util/u_inlines.h" -#define RADEON_CTX_MAX_PM4 (64 * 1024 / 4) - #define R600_ERR(fmt, args...) \ fprintf(stderr, "EE %s:%d %s - "fmt, __FILE__, __LINE__, __func__, ##args) diff --git a/src/gallium/winsys/r600/drm/evergreen_hw_context.c b/src/gallium/winsys/r600/drm/evergreen_hw_context.c index 54e26b3f0e9..63b3dc3940d 100644 --- a/src/gallium/winsys/r600/drm/evergreen_hw_context.c +++ b/src/gallium/winsys/r600/drm/evergreen_hw_context.c @@ -987,12 +987,12 @@ int evergreen_context_init(struct r600_context *ctx, struct radeon *radeon) ctx->cs = radeon->ws->cs_create(radeon->ws); /* allocate cs variables */ - ctx->bo = calloc(RADEON_CTX_MAX_PM4, sizeof(void *)); + ctx->bo = calloc(RADEON_MAX_CMDBUF_DWORDS, sizeof(void *)); if (ctx->bo == NULL) { r = -ENOMEM; goto out_err; } - ctx->pm4_ndwords = RADEON_CTX_MAX_PM4; + ctx->pm4_ndwords = RADEON_MAX_CMDBUF_DWORDS; ctx->pm4 = ctx->cs->buf; r600_init_cs(ctx); @@ -1152,7 +1152,7 @@ void evergreen_context_draw(struct r600_context *ctx, const struct r600_draw *dr /* update the max dword count to make sure we have enough space * reserved for flushing the destination caches */ - ctx->pm4_ndwords = RADEON_CTX_MAX_PM4 - ctx->num_dest_buffers * 7 - 16; + ctx->pm4_ndwords = RADEON_MAX_CMDBUF_DWORDS - ctx->num_dest_buffers * 7 - 16; if ((ctx->pm4_dirty_cdwords + ndwords + ctx->pm4_cdwords) > ctx->pm4_ndwords) { /* need to flush */ diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c index 577988d37ea..f89e8d6548d 100644 --- a/src/gallium/winsys/r600/drm/r600_hw_context.c +++ b/src/gallium/winsys/r600/drm/r600_hw_context.c @@ -911,12 +911,12 @@ int r600_context_init(struct r600_context *ctx, struct radeon *radeon) ctx->cs = radeon->ws->cs_create(radeon->ws); /* allocate cs variables */ - ctx->bo = calloc(RADEON_CTX_MAX_PM4, sizeof(void *)); + ctx->bo = calloc(RADEON_MAX_CMDBUF_DWORDS, sizeof(void *)); if (ctx->bo == NULL) { r = -ENOMEM; goto out_err; } - ctx->pm4_ndwords = RADEON_CTX_MAX_PM4; + ctx->pm4_ndwords = RADEON_MAX_CMDBUF_DWORDS; ctx->pm4 = ctx->cs->buf; r600_init_cs(ctx); @@ -1432,7 +1432,7 @@ void r600_context_draw(struct r600_context *ctx, const struct r600_draw *draw) /* update the max dword count to make sure we have enough space * reserved for flushing the destination caches */ - ctx->pm4_ndwords = RADEON_CTX_MAX_PM4 - ctx->num_dest_buffers * 7 - 16; + ctx->pm4_ndwords = RADEON_MAX_CMDBUF_DWORDS - ctx->num_dest_buffers * 7 - 16; if ((ctx->pm4_dirty_cdwords + ndwords + ctx->pm4_cdwords) > ctx->pm4_ndwords) { /* need to flush */ |