r600g: move family and chip_class from struct radeon to r600_screen

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 7a16e75..d7b979b 100644 (file)
--- a/src/gallium/drivers/r600/r600.h
+++ b/src/gallium/drivers/r600/r600.h
@@ -83,9 +83,6 @@ struct r600_tiling_info {
        unsigned group_bytes;
 };
 
-enum radeon_family r600_get_family(struct radeon *rw);
-enum chip_class r600_get_family_class(struct radeon *radeon);
-
 struct r600_resource {
        struct u_vbuf_resource          b;
 

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index e27522d..3838c0f 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -214,8 +214,8 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        rctx->screen = rscreen;
        rctx->ws = rscreen->ws;
        rctx->radeon = rscreen->radeon;
-       rctx->family = r600_get_family(rctx->radeon);
-       rctx->chip_class = r600_get_family_class(rctx->radeon);
+       rctx->family = rscreen->family;
+       rctx->chip_class = rscreen->chip_class;
 
        rctx->fences.bo = NULL;
        rctx->fences.data = NULL;
@@ -327,15 +327,14 @@ static const char *r600_get_family_name(enum radeon_family family)
 static const char* r600_get_name(struct pipe_screen* pscreen)
 {
        struct r600_screen *rscreen = (struct r600_screen *)pscreen;
-       enum radeon_family family = r600_get_family(rscreen->radeon);
 
-       return r600_get_family_name(family);
+       return r600_get_family_name(rscreen->family);
 }
 
 static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 {
        struct r600_screen *rscreen = (struct r600_screen *)pscreen;
-       enum radeon_family family = r600_get_family(rscreen->radeon);
+       enum radeon_family family = rscreen->family;
 
        switch (param) {
        /* Supported features (boolean caps). */
@@ -420,7 +419,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 static float r600_get_paramf(struct pipe_screen* pscreen, enum pipe_cap param)
 {
        struct r600_screen *rscreen = (struct r600_screen *)pscreen;
-       enum radeon_family family = r600_get_family(rscreen->radeon);
+       enum radeon_family family = rscreen->family;
 
        switch (param) {
        case PIPE_CAP_MAX_LINE_WIDTH:
@@ -684,7 +683,7 @@ static int r600_init_tiling(struct r600_screen *rscreen)
        uint32_t tiling_config = rscreen->info.r600_tiling_config;
 
        /* set default group bytes, overridden by tiling info ioctl */
-       if (r600_get_family_class(rscreen->radeon) <= R700) {
+       if (rscreen->chip_class <= R700) {
                rscreen->tiling_info.group_bytes = 256;
        } else {
                rscreen->tiling_info.group_bytes = 512;
@@ -693,13 +692,24 @@ static int r600_init_tiling(struct r600_screen *rscreen)
        if (!tiling_config)
                return 0;
 
-       if (r600_get_family_class(rscreen->radeon) <= R700) {
+       if (rscreen->chip_class <= R700) {
                return r600_interpret_tiling(rscreen, tiling_config);
        } else {
                return evergreen_interpret_tiling(rscreen, tiling_config);
        }
 }
 
+static unsigned radeon_family_from_device(unsigned device)
+{
+       switch (device) {
+#define CHIPSET(pciid, name, family) case pciid: return CHIP_##family;
+#include "pci_ids/r600_pci_ids.h"
+#undef CHIPSET
+       default:
+               return CHIP_UNKNOWN;
+       }
+}
+
 struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
 {
        struct r600_screen *rscreen;
@@ -718,6 +728,25 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
        rscreen->radeon = radeon;
        ws->query_info(ws, &rscreen->info);
 
+       rscreen->family = radeon_family_from_device(rscreen->info.pci_id);
+       if (rscreen->family == CHIP_UNKNOWN) {
+               fprintf(stderr, "r600: Unknown chipset 0x%04X\n", rscreen->info.pci_id);
+               radeon_destroy(radeon);
+               FREE(rscreen);
+               return NULL;
+       }
+
+       /* setup class */
+       if (rscreen->family == CHIP_CAYMAN) {
+               rscreen->chip_class = CAYMAN;
+       } else if (rscreen->family >= CHIP_CEDAR) {
+               rscreen->chip_class = EVERGREEN;
+       } else if (rscreen->family >= CHIP_RV770) {
+               rscreen->chip_class = R700;
+       } else {
+               rscreen->chip_class = R600;
+       }
+
        if (r600_init_tiling(rscreen)) {
                radeon_destroy(radeon);
                FREE(rscreen);
@@ -732,7 +761,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
        rscreen->screen.get_shader_param = r600_get_shader_param;
        rscreen->screen.get_paramf = r600_get_paramf;
        rscreen->screen.get_video_param = r600_get_video_param;
-       if (r600_get_family_class(radeon) >= EVERGREEN) {
+       if (rscreen->chip_class >= EVERGREEN) {
                rscreen->screen.is_format_supported = evergreen_is_format_supported;
        } else {
                rscreen->screen.is_format_supported = r600_is_format_supported;

diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index e94da48..c0cd3b3 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -76,6 +76,8 @@ struct r600_screen {
        struct pipe_screen              screen;
        struct radeon_winsys            *ws;
        struct radeon                   *radeon;
+       unsigned                        family;
+       enum chip_class                 chip_class;
        struct radeon_info              info;
        struct r600_tiling_info         tiling_info;
        struct util_slab_mempool        pool_buffers;

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 412efa5..99eb1aa 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -248,8 +248,7 @@ static void r600_setup_miptree(struct pipe_screen *screen,
                               unsigned array_mode)
 {
        struct pipe_resource *ptex = &rtex->resource.b.b.b;
-       struct radeon *radeon = ((struct r600_screen*)screen)->radeon;
-       enum chip_class chipc = r600_get_family_class(radeon);
+       enum chip_class chipc = ((struct r600_screen*)screen)->chip_class;
        unsigned size, layer_size, i, offset;
        unsigned nblocksx, nblocksy;
 
@@ -396,7 +395,7 @@ r600_texture_create_object(struct pipe_screen *screen,
 
        /* We must split depth and stencil into two separate buffers on Evergreen. */
        if (!(base->flags & R600_RESOURCE_FLAG_TRANSFER) &&
-           r600_get_family_class(((struct r600_screen*)screen)->radeon) >= EVERGREEN &&
+           ((struct r600_screen*)screen)->chip_class >= EVERGREEN &&
            util_format_is_depth_and_stencil(base->format)) {
                struct pipe_resource stencil;
                unsigned stencil_pitch_override = 0;

diff --git a/src/gallium/winsys/r600/drm/evergreen_hw_context.c b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
index 66d0db5..c9e3c9e 100644 (file)
--- a/src/gallium/winsys/r600/drm/evergreen_hw_context.c
+++ b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
@@ -25,6 +25,7 @@
  */
 #include "r600.h"
 #include "r600_priv.h"
+#include "r600_pipe.h"
 #include "evergreend.h"
 #include "util/u_memory.h"
 #include <errno.h>
@@ -919,7 +920,7 @@ int evergreen_context_init(struct r600_context *ctx, struct r600_screen *screen,
        }
 
        /* add blocks */
-       if (radeon->family == CHIP_CAYMAN)
+       if (ctx->screen->family == CHIP_CAYMAN)
                r = r600_context_add_block(ctx, cayman_config_reg_list,
                                           Elements(cayman_config_reg_list), PKT3_SET_CONFIG_REG, EVERGREEN_CONFIG_REG_OFFSET);
        else
@@ -927,7 +928,7 @@ int evergreen_context_init(struct r600_context *ctx, struct r600_screen *screen,
                                           Elements(evergreen_config_reg_list), PKT3_SET_CONFIG_REG, EVERGREEN_CONFIG_REG_OFFSET);
        if (r)
                goto out_err;
-       if (radeon->family == CHIP_CAYMAN)
+       if (ctx->screen->family == CHIP_CAYMAN)
                r = r600_context_add_block(ctx, cayman_context_reg_list,
                                           Elements(cayman_context_reg_list), PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET);
        else

diff --git a/src/gallium/winsys/r600/drm/r600_drm.c b/src/gallium/winsys/r600/drm/r600_drm.c
index 64c353c..eb2a351 100644 (file)
--- a/src/gallium/winsys/r600/drm/r600_drm.c
+++ b/src/gallium/winsys/r600/drm/r600_drm.c
@@ -30,27 +30,6 @@
 #include "util/u_memory.h"
 #include <errno.h>
 
-enum radeon_family r600_get_family(struct radeon *r600)
-{
-       return r600->family;
-}
-
-enum chip_class r600_get_family_class(struct radeon *radeon)
-{
-       return radeon->chip_class;
-}
-
-static unsigned radeon_family_from_device(unsigned device)
-{
-       switch (device) {
-#define CHIPSET(pciid, name, family) case pciid: return CHIP_##family;
-#include "pci_ids/r600_pci_ids.h"
-#undef CHIPSET
-       default:
-               return CHIP_UNKNOWN;
-       }
-}
-
 struct radeon *radeon_create(struct radeon_winsys *ws)
 {
        struct radeon *radeon = CALLOC_STRUCT(radeon);
@@ -61,24 +40,6 @@ struct radeon *radeon_create(struct radeon_winsys *ws)
        radeon->ws = ws;
        ws->query_info(ws, &radeon->info);
 
-       radeon->family = radeon_family_from_device(radeon->info.pci_id);
-       if (radeon->family == CHIP_UNKNOWN) {
-               fprintf(stderr, "Unknown chipset 0x%04X\n", radeon->info.pci_id);
-               radeon_destroy(radeon);
-               return NULL;
-       }
-
-       /* setup class */
-       if (radeon->family == CHIP_CAYMAN) {
-               radeon->chip_class = CAYMAN;
-       } else if (radeon->family >= CHIP_CEDAR) {
-               radeon->chip_class = EVERGREEN;
-       } else if (radeon->family >= CHIP_RV770) {
-               radeon->chip_class = R700;
-       } else {
-               radeon->chip_class = R600;
-       }
-
        return radeon;
 }
 

diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c
index d4f7eff..cea62e8 100644 (file)
--- a/src/gallium/winsys/r600/drm/r600_hw_context.c
+++ b/src/gallium/winsys/r600/drm/r600_hw_context.c
@@ -45,7 +45,7 @@ void r600_get_backend_mask(struct r600_context *ctx)
                unsigned backend_map = ctx->radeon->info.r600_backend_map;
                unsigned item_width, item_mask;
 
-               if (ctx->radeon->chip_class >= EVERGREEN) {
+               if (ctx->screen->chip_class >= EVERGREEN) {
                        item_width = 4;
                        item_mask = 0x7;
                } else {
@@ -130,7 +130,7 @@ static inline void r600_context_ps_partial_flush(struct r600_context *ctx)
 void r600_init_cs(struct r600_context *ctx)
 {
        /* R6xx requires this packet at the start of each command buffer */
-       if (ctx->radeon->family < CHIP_RV770) {
+       if (ctx->screen->family < CHIP_RV770) {
                ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_START_3D_CMDBUF, 0, 0);
                ctx->pm4[ctx->pm4_cdwords++] = 0x00000000;
        }
@@ -198,8 +198,8 @@ static void r600_init_block(struct r600_context *ctx,
                        }
                        block->reloc[block->nbo].bo_pm4_index = block->pm4_ndwords - 1;
                }
-               if ((ctx->radeon->family > CHIP_R600) &&
-                   (ctx->radeon->family < CHIP_RV770) && reg[i+j].flags & REG_FLAG_RV6XX_SBU) {
+               if ((ctx->screen->family > CHIP_R600) &&
+                   (ctx->screen->family < CHIP_RV770) && reg[i+j].flags & REG_FLAG_RV6XX_SBU) {
                        block->pm4[block->pm4_ndwords++] = PKT3(PKT3_SURFACE_BASE_UPDATE, 0, 0);
                        block->pm4[block->pm4_ndwords++] = reg[i+j].flush_flags;
                }
@@ -228,7 +228,7 @@ int r600_context_add_block(struct r600_context *ctx, const struct r600_reg *reg,
                }
 
                /* ignore regs not on R600 on R600 */
-               if ((reg[i].flags & REG_FLAG_NOT_R600) && ctx->radeon->family == CHIP_R600) {
+               if ((reg[i].flags & REG_FLAG_NOT_R600) && ctx->screen->family == CHIP_R600) {
                        n = 1;
                        continue;
                }
@@ -960,16 +960,16 @@ void r600_context_bo_flush(struct r600_context *ctx, unsigned flush_flags,
                return;
        }
 
-       if ((ctx->radeon->family < CHIP_RV770) &&
+       if ((ctx->screen->family < CHIP_RV770) &&
            (G_0085F0_CB_ACTION_ENA(flush_flags) ||
             G_0085F0_DB_ACTION_ENA(flush_flags))) {
                if (ctx->flags & R600_CONTEXT_CHECK_EVENT_FLUSH) {
                        /* the rv670 seems to fail fbo-generatemipmap unless we flush the CB1 dest base ena */
                        if ((bo->cs_buf->binding & BO_BOUND_TEXTURE) &&
                            (flush_flags & S_0085F0_CB_ACTION_ENA(1))) {
-                               if ((ctx->radeon->family == CHIP_RV670) ||
-                                   (ctx->radeon->family == CHIP_RS780) ||
-                                   (ctx->radeon->family == CHIP_RS880)) {
+                               if ((ctx->screen->family == CHIP_RV670) ||
+                                   (ctx->screen->family == CHIP_RS780) ||
+                                   (ctx->screen->family == CHIP_RS880)) {
                                        ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_SURFACE_SYNC, 3, ctx->predicate_drawing);
                                        ctx->pm4[ctx->pm4_cdwords++] = S_0085F0_CB1_DEST_BASE_ENA(1);     /* CP_COHER_CNTL */
                                        ctx->pm4[ctx->pm4_cdwords++] = 0xffffffff;      /* CP_COHER_SIZE */
@@ -1100,7 +1100,7 @@ static void r600_context_dirty_resource_block(struct r600_context *ctx,
 void r600_context_pipe_state_set_resource(struct r600_context *ctx, struct r600_pipe_resource_state *state, struct r600_block *block)
 {
        int dirty;
-       int num_regs = ctx->radeon->chip_class >= EVERGREEN ? 8 : 7;
+       int num_regs = ctx->screen->chip_class >= EVERGREEN ? 8 : 7;
        boolean is_vertex;
 
        if (state == NULL) {
@@ -1423,7 +1423,7 @@ void r600_context_draw(struct r600_context *ctx, const struct r600_draw *draw)
 
        /* queries need some special values */
        if (ctx->num_query_running) {
-               if (ctx->radeon->family >= CHIP_RV770) {
+               if (ctx->screen->family >= CHIP_RV770) {
                        r600_context_reg(ctx,
                                        R_028D0C_DB_RENDER_CONTROL,
                                        S_028D0C_R700_PERFECT_ZPASS_COUNTS(1),
@@ -1495,7 +1495,7 @@ void r600_context_flush(struct r600_context *ctx, unsigned flags)
        /* suspend queries */
        r600_context_queries_suspend(ctx);
 
-       if (ctx->radeon->chip_class >= EVERGREEN)
+       if (ctx->screen->chip_class >= EVERGREEN)
                evergreen_context_flush_dest_caches(ctx);
        else
                r600_context_flush_dest_caches(ctx);

diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h
index 9294d9e..6ca8f7b 100644 (file)
--- a/src/gallium/winsys/r600/drm/r600_priv.h
+++ b/src/gallium/winsys/r600/drm/r600_priv.h
@@ -37,8 +37,6 @@
 struct radeon {
        struct radeon_winsys            *ws;
        struct radeon_info              info;
-       unsigned                        family;
-       enum chip_class                 chip_class;
 };
 
 /* these flags are used in register flags and added into block flags */