fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g,radeonsi: add debug option which forces DMA for copy_region and blit

Browse source
This commit is contained in:
Marek Olšák 2014-09-06 17:07:50 +02:00
parent d7ec3db349
commit d13d2fd161
11 changed files with 52 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/r600/evergreen_state.c
View file

@ -3365,7 +3365,7 @@ static void evergreen_dma_copy(struct pipe_context *ctx,
return;
fallback:
ctx->resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
r600_resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
src, src_level, src_box);
}

18
src/gallium/drivers/r600/r600_blit.c
View file

@ -565,13 +565,13 @@ static void r600_clear_buffer(struct pipe_context *ctx, struct pipe_resource *ds
}
}
static void r600_resource_copy_region(struct pipe_context *ctx,
struct pipe_resource *dst,
unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz,
struct pipe_resource *src,
unsigned src_level,
const struct pipe_box *src_box)
void r600_resource_copy_region(struct pipe_context *ctx,
struct pipe_resource *dst,
unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz,
struct pipe_resource *src,
unsigned src_level,
const struct pipe_box *src_box)
{
struct r600_context *rctx = (struct r600_context *)ctx;
struct pipe_surface *dst_view, dst_templ;
@ -815,6 +815,10 @@ static void r600_blit(struct pipe_context *ctx,
return; /* error */
}
if (rctx->screen->b.debug_flags & DBG_FORCE_DMA &&
util_try_blit_via_copy_region(ctx, info))
return;
r600_blitter_begin(ctx, R600_BLIT |
(info->render_condition_enable ? 0 : R600_DISABLE_RENDER_COND));
util_blitter_blit(rctx->blitter, info);

3
src/gallium/drivers/r600/r600_pipe.c
View file

@ -191,6 +191,9 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
if (!rctx->isa || r600_isa_init(rctx, rctx->isa))
goto fail;
if (rscreen->b.debug_flags & DBG_FORCE_DMA)
rctx->b.b.resource_copy_region = rctx->b.dma_copy;
rctx->blitter = util_blitter_create(&rctx->b.b);
if (rctx->blitter == NULL)
goto fail;

11
src/gallium/drivers/r600/r600_pipe.h
View file

@ -195,8 +195,8 @@ struct r600_gs_rings_state {
/* This must start from 16. */
/* features */
#define DBG_LLVM (1 << 17)
#define DBG_NO_CP_DMA (1 << 18)
#define DBG_LLVM (1 << 29)
#define DBG_NO_CP_DMA (1 << 30)
/* shader backend */
#define DBG_NO_SB (1 << 21)
#define DBG_SB_CS (1 << 22)
@ -551,6 +551,13 @@ void r600_decompress_depth_textures(struct r600_context *rctx,
struct r600_samplerview_state *textures);
void r600_decompress_color_textures(struct r600_context *rctx,
struct r600_samplerview_state *textures);
void r600_resource_copy_region(struct pipe_context *ctx,
struct pipe_resource *dst,
unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz,
struct pipe_resource *src,
unsigned src_level,
const struct pipe_box *src_box);
/* r600_shader.c */
int r600_pipe_shader_create(struct pipe_context *ctx,

2
src/gallium/drivers/r600/r600_state.c
View file

@ -2966,7 +2966,7 @@ static void r600_dma_copy(struct pipe_context *ctx,
return;
fallback:
ctx->resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
r600_resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
src, src_level, src_box);
}

1
src/gallium/drivers/radeon/r600_pipe_common.c
View file

@ -320,6 +320,7 @@ static const struct debug_named_value common_debug_options[] = {
{ "no2d", DBG_NO_2D_TILING, "Disable 2D tiling" },
{ "notiling", DBG_NO_TILING, "Disable tiling" },
{ "switch_on_eop", DBG_SWITCH_ON_EOP, "Program WD/IA to switch on end-of-packet." },
{ "forcedma", DBG_FORCE_DMA, "Use asynchronous DMA for all operations when possible." },
DEBUG_NAMED_VALUE_END /* must be last */
};

3
src/gallium/drivers/radeon/r600_pipe_common.h
View file

@ -98,7 +98,8 @@
#define DBG_NO_2D_TILING (1 << 13)
#define DBG_NO_TILING (1 << 14)
#define DBG_SWITCH_ON_EOP (1 << 15)
/* The maximum allowed bit is 15. */
#define DBG_FORCE_DMA (1 << 16)
/* The maximum allowed bit is 20. */
#define R600_MAP_BUFFER_ALIGNMENT 64

19
src/gallium/drivers/radeonsi/si_blit.c
View file

@ -23,6 +23,7 @@
#include "si_pipe.h"
#include "util/u_format.h"
#include "util/u_surface.h"
enum si_blitter_op /* bitmask */
{
@ -531,13 +532,13 @@ static void si_reset_blittable_to_orig(struct pipe_resource *tex,
rtex->mipmap_shift = 0;
}
static void si_resource_copy_region(struct pipe_context *ctx,
struct pipe_resource *dst,
unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz,
struct pipe_resource *src,
unsigned src_level,
const struct pipe_box *src_box)
void si_resource_copy_region(struct pipe_context *ctx,
struct pipe_resource *dst,
unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz,
struct pipe_resource *src,
unsigned src_level,
const struct pipe_box *src_box)
{
struct si_context *sctx = (struct si_context *)ctx;
struct r600_texture *rdst = (struct r600_texture*)dst;
@ -770,6 +771,10 @@ static void si_blit(struct pipe_context *ctx,
info->src.box.z,
info->src.box.z + info->src.box.depth - 1);
if (sctx->screen->b.debug_flags & DBG_FORCE_DMA &&
util_try_blit_via_copy_region(ctx, info))
return;
si_blitter_begin(ctx, SI_BLIT |
(info->render_condition_enable ? 0 : SI_DISABLE_RENDER_COND));
util_blitter_blit(sctx->blitter, info);

4
src/gallium/drivers/radeonsi/si_dma.c
View file

@ -310,6 +310,6 @@ void si_dma_copy(struct pipe_context *ctx,
return;
fallback:
ctx->resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
src, src_level, src_box);
si_resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
src, src_level, src_box);
}

3
src/gallium/drivers/radeonsi/si_pipe.c
View file

@ -118,6 +118,9 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
goto fail;
}
if (sscreen->b.debug_flags & DBG_FORCE_DMA)
sctx->b.b.resource_copy_region = sctx->b.dma_copy;
sctx->blitter = util_blitter_create(&sctx->b.b);
if (sctx->blitter == NULL)
goto fail;

7
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -174,6 +174,13 @@ void si_flush_depth_textures(struct si_context *sctx,
struct si_textures_info *textures);
void si_decompress_color_textures(struct si_context *sctx,
struct si_textures_info *textures);
void si_resource_copy_region(struct pipe_context *ctx,
struct pipe_resource *dst,
unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz,
struct pipe_resource *src,
unsigned src_level,
const struct pipe_box *src_box);
/* si_dma.c */
void si_dma_copy(struct pipe_context *ctx,