diff options
| author | Marek Olšák <[email protected]> | 2018-05-01 13:08:44 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-05-10 18:26:32 -0400 |
| commit | cb0f5cddcca06706a691f9b54d129ef98a2afb38 (patch) | |
| tree | 99298027f6b21b3403a4549d147a11ae2f6abfcc | |
| parent | ce954ac6f3259bd1cedec63a27bbccd3f81f1098 (diff) | |
ac: move the Fiji kernel workaround for raster config out of the switch
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/amd/common/ac_gpu_info.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 8147fb0bbc3..83e729b3d15 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -594,14 +594,8 @@ ac_get_raster_config(struct radeon_info *info, raster_config_1 = 0x0000002e; break; case CHIP_FIJI: - if (info->cik_macrotile_mode_array[0] == 0x000000e8) { - /* old kernels with old tiling config */ - raster_config = 0x16000012; - raster_config_1 = 0x0000002a; - } else { - raster_config = 0x3a00161a; - raster_config_1 = 0x0000002e; - } + raster_config = 0x3a00161a; + raster_config_1 = 0x0000002e; break; case CHIP_POLARIS10: raster_config = 0x16000012; @@ -655,6 +649,15 @@ ac_get_raster_config(struct radeon_info *info, if (info->family == CHIP_KAVERI && info->drm_major == 2) raster_config = 0x00000000; + /* Fiji: Old kernels have incorrect tiling config. This decreases + * RB performance by 25%. (it disables 1 RB in the second packer) + */ + if (info->family == CHIP_FIJI && + info->cik_macrotile_mode_array[0] == 0x000000e8) { + raster_config = 0x16000012; + raster_config_1 = 0x0000002a; + } + *raster_config_p = raster_config; *raster_config_1_p = raster_config_1; } |