<div dir="ltr">ping<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Sep 25, 2019 at 4:35 PM Marek Olšák <<a href="mailto:maraeo@gmail.com">maraeo@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Marek Olšák <<a href="mailto:marek.olsak@amd.com" target="_blank">marek.olsak@amd.com</a>><br>
<br>
Signed-off-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com" target="_blank">marek.olsak@amd.com</a>><br>
---<br>
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 13 +++++--------<br>
1 file changed, 5 insertions(+), 8 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c<br>
index ca01643fa0c8..73cd254449b3 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c<br>
@@ -5275,29 +5275,26 @@ static void gfx_v10_0_set_rlc_funcs(struct amdgpu_device *adev)<br>
case CHIP_NAVI12:<br>
adev->gfx.rlc.funcs = &gfx_v10_0_rlc_funcs;<br>
break;<br>
default:<br>
break;<br>
}<br>
}<br>
<br>
static void gfx_v10_0_set_gds_init(struct amdgpu_device *adev)<br>
{<br>
- /* init asic gds info */<br>
- switch (adev->asic_type) {<br>
- case CHIP_NAVI10:<br>
- default:<br>
- adev->gds.gds_size = 0x10000;<br>
- adev->gds.gds_compute_max_wave_id = 0x4ff;<br>
- break;<br>
- }<br>
+ unsigned total_cu = adev->gfx.config.max_cu_per_sh *<br>
+ adev->gfx.config.max_sh_per_se *<br>
+ adev->gfx.config.max_shader_engines;<br>
<br>
+ adev->gds.gds_size = 0x10000;<br>
+ adev->gds.gds_compute_max_wave_id = total_cu * 32 - 1;<br>
adev->gds.gws_size = 64;<br>
adev->gds.oa_size = 16;<br>
}<br>
<br>
static void gfx_v10_0_set_user_wgp_inactive_bitmap_per_sh(struct amdgpu_device *adev,<br>
u32 bitmap)<br>
{<br>
u32 data;<br>
<br>
if (!bitmap)<br>
-- <br>
2.17.1<br>
<br>
</blockquote></div>