]>
Commit | Line | Data |
---|---|---|
bbecac5b GKH |
1 | From 545b0bcde7fbd3ee408fa842ea0731451dc4bd0a Mon Sep 17 00:00:00 2001 |
2 | From: Alex Deucher <alexander.deucher@amd.com> | |
3 | Date: Thu, 1 Mar 2018 11:05:31 -0500 | |
4 | Subject: drm/amdgpu: fix KV harvesting | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | From: Alex Deucher <alexander.deucher@amd.com> | |
10 | ||
11 | commit 545b0bcde7fbd3ee408fa842ea0731451dc4bd0a upstream. | |
12 | ||
13 | Always set the graphics values to the max for the | |
14 | asic type. E.g., some 1 RB chips are actually 1 RB chips, | |
15 | others are actually harvested 2 RB chips. | |
16 | ||
17 | Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=99353 | |
18 | Reviewed-by: Christian König <christian.koenig@amd.com> | |
19 | Signed-off-by: Alex Deucher <alexander.deucher@amd.com> | |
20 | Cc: stable@vger.kernel.org | |
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
22 | ||
23 | --- | |
24 | drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 30 ++---------------------------- | |
25 | 1 file changed, 2 insertions(+), 28 deletions(-) | |
26 | ||
27 | --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | |
28 | +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | |
29 | @@ -4403,34 +4403,8 @@ static void gfx_v7_0_gpu_early_init(stru | |
30 | case CHIP_KAVERI: | |
31 | adev->gfx.config.max_shader_engines = 1; | |
32 | adev->gfx.config.max_tile_pipes = 4; | |
33 | - if ((adev->pdev->device == 0x1304) || | |
34 | - (adev->pdev->device == 0x1305) || | |
35 | - (adev->pdev->device == 0x130C) || | |
36 | - (adev->pdev->device == 0x130F) || | |
37 | - (adev->pdev->device == 0x1310) || | |
38 | - (adev->pdev->device == 0x1311) || | |
39 | - (adev->pdev->device == 0x131C)) { | |
40 | - adev->gfx.config.max_cu_per_sh = 8; | |
41 | - adev->gfx.config.max_backends_per_se = 2; | |
42 | - } else if ((adev->pdev->device == 0x1309) || | |
43 | - (adev->pdev->device == 0x130A) || | |
44 | - (adev->pdev->device == 0x130D) || | |
45 | - (adev->pdev->device == 0x1313) || | |
46 | - (adev->pdev->device == 0x131D)) { | |
47 | - adev->gfx.config.max_cu_per_sh = 6; | |
48 | - adev->gfx.config.max_backends_per_se = 2; | |
49 | - } else if ((adev->pdev->device == 0x1306) || | |
50 | - (adev->pdev->device == 0x1307) || | |
51 | - (adev->pdev->device == 0x130B) || | |
52 | - (adev->pdev->device == 0x130E) || | |
53 | - (adev->pdev->device == 0x1315) || | |
54 | - (adev->pdev->device == 0x131B)) { | |
55 | - adev->gfx.config.max_cu_per_sh = 4; | |
56 | - adev->gfx.config.max_backends_per_se = 1; | |
57 | - } else { | |
58 | - adev->gfx.config.max_cu_per_sh = 3; | |
59 | - adev->gfx.config.max_backends_per_se = 1; | |
60 | - } | |
61 | + adev->gfx.config.max_cu_per_sh = 8; | |
62 | + adev->gfx.config.max_backends_per_se = 2; | |
63 | adev->gfx.config.max_sh_per_se = 1; | |
64 | adev->gfx.config.max_texture_channel_caches = 4; | |
65 | adev->gfx.config.max_gprs = 256; |