From 9f7c6c78bc9d419aebe0baf69e1ef7b9c4f66b80 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 30 Nov 2018 08:26:56 -0500 Subject: [PATCH] freedreno/a5xx+a6xx: remove unused fs/vs pvt mem copy/pasta from older gens Signed-off-by: Rob Clark --- src/gallium/drivers/freedreno/a5xx/fd5_context.c | 8 -------- src/gallium/drivers/freedreno/a5xx/fd5_context.h | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_context.c | 8 -------- src/gallium/drivers/freedreno/a6xx/fd6_context.h | 2 -- 4 files changed, 20 deletions(-) diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_context.c b/src/gallium/drivers/freedreno/a5xx/fd5_context.c index e6af5d265a6..985face47ab 100644 --- a/src/gallium/drivers/freedreno/a5xx/fd5_context.c +++ b/src/gallium/drivers/freedreno/a5xx/fd5_context.c @@ -48,8 +48,6 @@ fd5_context_destroy(struct pipe_context *pctx) fd_context_destroy(pctx); - fd_bo_del(fd5_ctx->vs_pvt_mem); - fd_bo_del(fd5_ctx->fs_pvt_mem); fd_bo_del(fd5_ctx->vsc_size_mem); fd_bo_del(fd5_ctx->blit_mem); @@ -105,12 +103,6 @@ fd5_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) util_blitter_set_texture_multisample(fd5_ctx->base.blitter, true); - fd5_ctx->vs_pvt_mem = fd_bo_new(screen->dev, 0x2000, - DRM_FREEDRENO_GEM_TYPE_KMEM); - - fd5_ctx->fs_pvt_mem = fd_bo_new(screen->dev, 0x2000, - DRM_FREEDRENO_GEM_TYPE_KMEM); - fd5_ctx->vsc_size_mem = fd_bo_new(screen->dev, 0x1000, DRM_FREEDRENO_GEM_TYPE_KMEM); diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_context.h b/src/gallium/drivers/freedreno/a5xx/fd5_context.h index 324878b4348..a8e5953b390 100644 --- a/src/gallium/drivers/freedreno/a5xx/fd5_context.h +++ b/src/gallium/drivers/freedreno/a5xx/fd5_context.h @@ -36,8 +36,6 @@ struct fd5_context { struct fd_context base; - struct fd_bo *vs_pvt_mem, *fs_pvt_mem; - /* This only needs to be 4 * num_of_pipes bytes (ie. 32 bytes). We * could combine it with another allocation. */ diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_context.c b/src/gallium/drivers/freedreno/a6xx/fd6_context.c index 35fd03c3d99..08318082625 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_context.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_context.c @@ -48,8 +48,6 @@ fd6_context_destroy(struct pipe_context *pctx) fd_context_destroy(pctx); - fd_bo_del(fd6_ctx->vs_pvt_mem); - fd_bo_del(fd6_ctx->fs_pvt_mem); fd_bo_del(fd6_ctx->vsc_data); fd_bo_del(fd6_ctx->vsc_data2); fd_bo_del(fd6_ctx->blit_mem); @@ -111,12 +109,6 @@ fd6_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) pctx->delete_rasterizer_state = fd6_rasterizer_state_delete; pctx->delete_depth_stencil_alpha_state = fd6_depth_stencil_alpha_state_delete; - fd6_ctx->vs_pvt_mem = fd_bo_new(screen->dev, 0x2000, - DRM_FREEDRENO_GEM_TYPE_KMEM); - - fd6_ctx->fs_pvt_mem = fd_bo_new(screen->dev, 0x2000, - DRM_FREEDRENO_GEM_TYPE_KMEM); - fd6_ctx->vsc_data = fd_bo_new(screen->dev, (A6XX_VSC_DATA_PITCH * 32) + 0x100, DRM_FREEDRENO_GEM_TYPE_KMEM); diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_context.h b/src/gallium/drivers/freedreno/a6xx/fd6_context.h index 2493813fe1a..9c957322a53 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_context.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_context.h @@ -39,8 +39,6 @@ struct fd6_context { struct fd_context base; - struct fd_bo *vs_pvt_mem, *fs_pvt_mem; - /* Two buffers related to hw binning / visibility stream (VSC). * Compared to previous generations * (1) we cannot specify individual buffers per VSC, instead -- 2.30.2