Module: Mesa Branch: master Commit: 7773c7109c9a3b31767fab012183f64b932264a7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7773c7109c9a3b31767fab012183f64b932264a7
Author: Christian Koenig <christian.koe...@amd.com> Date: Thu Sep 20 12:15:11 2012 +0200 radeonsi: start seperating commands into si_commands.c Signed-off-by: Christian Koenig <christian.koe...@amd.com> Reviewed-by: Michel Dänzer <michel.daen...@amd.com> --- src/gallium/drivers/radeonsi/si_commands.c | 8 ++++++++ src/gallium/drivers/radeonsi/si_state.c | 5 +---- src/gallium/drivers/radeonsi/si_state.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_commands.c b/src/gallium/drivers/radeonsi/si_commands.c index e9492b8..5215a34 100644 --- a/src/gallium/drivers/radeonsi/si_commands.c +++ b/src/gallium/drivers/radeonsi/si_commands.c @@ -28,6 +28,14 @@ #include "radeonsi_pm4.h" #include "sid.h" +void si_cmd_context_control(struct si_pm4_state *pm4) +{ + si_pm4_cmd_begin(pm4, PKT3_CONTEXT_CONTROL); + si_pm4_cmd_add(pm4, 0x80000000); + si_pm4_cmd_add(pm4, 0x80000000); + si_pm4_cmd_end(pm4, false); +} + void si_cmd_surface_sync(struct si_pm4_state *pm4, uint32_t cp_coher_cntl) { si_pm4_cmd_begin(pm4, PKT3_SURFACE_SYNC); diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 4def9a8..8d19848 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2596,10 +2596,7 @@ void si_init_config(struct r600_context *rctx) { struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state); - si_pm4_cmd_begin(pm4, PKT3_CONTEXT_CONTROL); - si_pm4_cmd_add(pm4, 0x80000000); - si_pm4_cmd_add(pm4, 0x80000000); - si_pm4_cmd_end(pm4, false); + si_cmd_context_control(pm4); si_pm4_set_reg(pm4, R_028A4C_PA_SC_MODE_CNTL_1, 0x0); diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 5c908a7..5e945ec 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -159,6 +159,7 @@ void si_set_so_targets(struct pipe_context *ctx, void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo); /* si_commands.c */ +void si_cmd_context_control(struct si_pm4_state *pm4); void si_cmd_surface_sync(struct si_pm4_state *pm4, uint32_t cp_coher_cntl); #endif _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit