r600g: undefine RADEON_CTX_MAX_PM4

winsys/radeon has its own definition.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h
index b5d2d74628abd73b86fe82bf72973dec441f00ba..232912f914da3459f69cf27cb9be2ef96b95a51f 100644 (file)
--- 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 54e26b3f0e92c66eadf7ba54156defea6c6dc46b..63b3dc3940db27921c7d353f6f8d75cb3f8e4008 100644 (file)
--- 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 577988d37ea79d81bc397064477a7dfd8958f75d..f89e8d6548dbabd309767b103b6deed2ef4507a1 100644 (file)
--- 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 */