On Wed, Mar 7, 2012 at 6:56 PM, Marek Ol??k <maraeo at gmail.com> wrote:
> Signed-off-by: Marek Ol??k <maraeo at gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> ?drivers/gpu/drm/radeon/evergreen_cs.c ? ? | ? ?8 ++++++++
> ?drivers/gpu/drm/radeon/r600_cs.c ? ? ? ? ?| ? ?8 ++++++++
> ?drivers/gpu/drm/radeon/reg_srcs/cayman ? ?| ? ?1 -
> ?drivers/gpu/drm/radeon/reg_srcs/evergreen | ? ?1 -
> ?drivers/gpu/drm/radeon/reg_srcs/r600 ? ? ?| ? ?1 -
> ?5 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c
> b/drivers/gpu/drm/radeon/evergreen_cs.c
> index bc6a2ea..78d115a 100644
> --- a/drivers/gpu/drm/radeon/evergreen_cs.c
> +++ b/drivers/gpu/drm/radeon/evergreen_cs.c
> @@ -85,6 +85,7 @@ struct evergreen_cs_track {
> ? ? ? ?u32 ? ? ? ? ? ? ? ? ? ? db_s_write_offset;
> ? ? ? ?struct radeon_bo ? ? ? ?*db_s_read_bo;
> ? ? ? ?struct radeon_bo ? ? ? ?*db_s_write_bo;
> + ? ? ? bool ? ? ? ? ? ? ? ? ? ?sx_misc_kill_all_prims;
> ?};
>
> ?static u32 evergreen_cs_get_aray_mode(u32 tiling_flags)
> @@ -162,6 +163,7 @@ static void evergreen_cs_track_init(struct
> evergreen_cs_track *track)
> ? ? ? ? ? ? ? ?track->vgt_strmout_bo_offset[i] = 0xFFFFFFFF;
> ? ? ? ? ? ? ? ?track->vgt_strmout_bo_mc[i] = 0xFFFFFFFF;
> ? ? ? ?}
> + ? ? ? track->sx_misc_kill_all_prims = false;
> ?}
>
> ?struct eg_surface {
> @@ -821,6 +823,9 @@ static int evergreen_cs_track_check(struct
> radeon_cs_parser *p)
> ? ? ? ? ? ? ? ?}
> ? ? ? ?}
>
> + ? ? ? if (track->sx_misc_kill_all_prims)
> + ? ? ? ? ? ? ? return 0;
> +
> ? ? ? ?/* check that we have a cb for each enabled target
> ? ? ? ? */
> ? ? ? ?tmp = track->cb_target_mask;
> @@ -1748,6 +1753,9 @@ static int evergreen_cs_check_reg(struct
> radeon_cs_parser *p, u32 reg, u32 idx)
> ? ? ? ? ? ? ? ?}
> ? ? ? ? ? ? ? ?ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
> ? ? ? ? ? ? ? ?break;
> + ? ? ? case SX_MISC:
> + ? ? ? ? ? ? ? track->sx_misc_kill_all_prims = (radeon_get_ib_value(p, idx)
> & 0x1) != 0;
> + ? ? ? ? ? ? ? break;
> ? ? ? ?default:
> ? ? ? ? ? ? ? ?dev_warn(p->dev, "forbidden register 0x%08x at %d\n", reg,
> idx);
> ? ? ? ? ? ? ? ?return -EINVAL;
> diff --git a/drivers/gpu/drm/radeon/r600_cs.c
> b/drivers/gpu/drm/radeon/r600_cs.c
> index 5cbe948..abddfd0 100644
> --- a/drivers/gpu/drm/radeon/r600_cs.c
> +++ b/drivers/gpu/drm/radeon/r600_cs.c
> @@ -74,6 +74,7 @@ struct r600_cs_track {
> ? ? ? ?u32 ? ? ? ? ? ? ? ? ? ? db_offset;
> ? ? ? ?struct radeon_bo ? ? ? ?*db_bo;
> ? ? ? ?u64 ? ? ? ? ? ? ? ? ? ? db_bo_mc;
> + ? ? ? bool ? ? ? ? ? ? ? ? ? ?sx_misc_kill_all_prims;
> ?};
>
> ?#define FMT_8_BIT(fmt, vc) ? [fmt] = { 1, 1, 1, vc, CHIP_R600 }
> @@ -322,6 +323,7 @@ static void r600_cs_track_init(struct r600_cs_track
> *track)
> ? ? ? ? ? ? ? ?track->vgt_strmout_bo_offset[i] = 0xFFFFFFFF;
> ? ? ? ? ? ? ? ?track->vgt_strmout_bo_mc[i] = 0xFFFFFFFF;
> ? ? ? ?}
> + ? ? ? track->sx_misc_kill_all_prims = false;
> ?}
>
> ?static int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i)
> @@ -479,6 +481,9 @@ static int r600_cs_track_check(struct radeon_cs_parser *p)
> ? ? ? ? ? ? ? ?}
> ? ? ? ?}
>
> + ? ? ? if (track->sx_misc_kill_all_prims)
> + ? ? ? ? ? ? ? return 0;
> +
> ? ? ? ?/* check that we have a cb for each enabled target, we don't check
> ? ? ? ? * shader_mask because it seems mesa isn't always setting it :(
> ? ? ? ? */
> @@ -1279,6 +1284,9 @@ static int r600_cs_check_reg(struct radeon_cs_parser
> *p, u32 reg, u32 idx)
> ? ? ? ? ? ? ? ?}
> ? ? ? ? ? ? ? ?ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
> ? ? ? ? ? ? ? ?break;
> + ? ? ? case SX_MISC:
> + ? ? ? ? ? ? ? track->sx_misc_kill_all_prims = (radeon_get_ib_value(p, idx)
> & 0x1) != 0;
> + ? ? ? ? ? ? ? break;
> ? ? ? ?default:
> ? ? ? ? ? ? ? ?dev_warn(p->dev, "forbidden register 0x%08x at %d\n", reg,
> idx);
> ? ? ? ? ? ? ? ?return -EINVAL;
> diff --git a/drivers/gpu/drm/radeon/reg_srcs/cayman
> b/drivers/gpu/drm/radeon/reg_srcs/cayman
> index 7b526d3..2d30b06 100644
> --- a/drivers/gpu/drm/radeon/reg_srcs/cayman
> +++ b/drivers/gpu/drm/radeon/reg_srcs/cayman
> @@ -208,7 +208,6 @@ cayman 0x9400
> ?0x00028344 PA_SC_VPORT_ZMAX_14
> ?0x00028348 PA_SC_VPORT_ZMIN_15
> ?0x0002834C PA_SC_VPORT_ZMAX_15
> -0x00028350 SX_MISC
> ?0x00028354 SX_SURFACE_SYNC
> ?0x0002835C SX_SCATTER_EXPORT_SIZE
> ?0x00028380 SQ_VTX_SEMANTIC_0
> diff --git a/drivers/gpu/drm/radeon/reg_srcs/evergreen
> b/drivers/gpu/drm/radeon/reg_srcs/evergreen
> index 7f43394..ba48394 100644
> --- a/drivers/gpu/drm/radeon/reg_srcs/evergreen
> +++ b/drivers/gpu/drm/radeon/reg_srcs/evergreen
> @@ -224,7 +224,6 @@ evergreen 0x9400
> ?0x00028344 PA_SC_VPORT_ZMAX_14
> ?0x00028348 PA_SC_VPORT_ZMIN_15
> ?0x0002834C PA_SC_VPORT_ZMAX_15
> -0x00028350 SX_MISC
> ?0x00028354 SX_SURFACE_SYNC
> ?0x00028380 SQ_VTX_SEMANTIC_0
> ?0x00028384 SQ_VTX_SEMANTIC_1
> diff --git a/drivers/gpu/drm/radeon/reg_srcs/r600
> b/drivers/gpu/drm/radeon/reg_srcs/r600
> index 79d2455..626c24e 100644
> --- a/drivers/gpu/drm/radeon/reg_srcs/r600
> +++ b/drivers/gpu/drm/radeon/reg_srcs/r600
> @@ -438,7 +438,6 @@ r600 0x9400
> ?0x00028638 SPI_VS_OUT_ID_9
> ?0x00028438 SX_ALPHA_REF
> ?0x00028410 SX_ALPHA_TEST_CONTROL
> -0x00028350 SX_MISC
> ?0x00028354 SX_SURFACE_SYNC
> ?0x00009014 SX_MEMORY_EXPORT_SIZE
> ?0x00009604 TC_INVALIDATE
> --
> 1.7.5.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
