From: Marek Olšák Date: Fri, 8 Apr 2016 10:15:50 +0000 (+0200) Subject: radeonsi: set PA_SU_SMALL_PRIM_FILTER_CNTL register on Polaris X-Git-Tag: android-x86-6.0-r1~84 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=684e555aaa66a212bcff72081d6f7bf3cbf6229d;p=android-x86%2Fexternal-mesa.git radeonsi: set PA_SU_SMALL_PRIM_FILTER_CNTL register on Polaris This was missing. Cc: 12.0 Reviewed-by: Alex Deucher (cherry picked from commit c1dbc563f4a6a6b3438e97a2418922c22c1e77bf) --- diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 8dfeb31bffc..3bbb81ab924 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -3810,6 +3810,11 @@ static void si_init_config(struct si_context *sctx) if (sctx->b.family == CHIP_STONEY) si_pm4_set_reg(pm4, R_028C40_PA_SC_SHADER_CONTROL, 0); + if (sctx->b.family >= CHIP_POLARIS10) + si_pm4_set_reg(pm4, R_028830_PA_SU_SMALL_PRIM_FILTER_CNTL, + S_028830_SMALL_PRIM_FILTER_ENABLE(1) | + S_028830_LINE_FILTER_DISABLE(1)); /* line bug */ + si_pm4_set_reg(pm4, R_028080_TA_BC_BASE_ADDR, border_color_va >> 8); if (sctx->b.chip_class >= CIK) si_pm4_set_reg(pm4, R_028084_TA_BC_BASE_ADDR_HI, border_color_va >> 40); diff --git a/src/gallium/drivers/radeonsi/sid.h b/src/gallium/drivers/radeonsi/sid.h index 25f8cf5cee4..8d49b9dfd3f 100644 --- a/src/gallium/drivers/radeonsi/sid.h +++ b/src/gallium/drivers/radeonsi/sid.h @@ -7207,6 +7207,12 @@ #define G_02882C_YMAX_BOTTOM_EXCLUSION(x) (((x) >> 31) & 0x1) #define C_02882C_YMAX_BOTTOM_EXCLUSION 0x7FFFFFFF /* */ +#define R_028830_PA_SU_SMALL_PRIM_FILTER_CNTL 0x028830 /* Polaris */ +#define S_028830_SMALL_PRIM_FILTER_ENABLE(x) (((x) & 0x1) << 0) +#define S_028830_TRIANGLE_FILTER_DISABLE(x) (((x) & 0x1) << 1) +#define S_028830_LINE_FILTER_DISABLE(x) (((x) & 0x1) << 2) +#define S_028830_POINT_FILTER_DISABLE(x) (((x) & 0x1) << 3) +#define S_028830_RECTANGLE_FILTER_DISABLE(x) (((x) & 0x1) << 4) #define R_028A00_PA_SU_POINT_SIZE 0x028A00 #define S_028A00_HEIGHT(x) (((unsigned)(x) & 0xFFFF) << 0) #define G_028A00_HEIGHT(x) (((x) >> 0) & 0xFFFF)