drm/amdgpu/gfx8: apply dynamic cu mask to APUs as well
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 24 Aug 2017 20:46:29 +0000 (16:46 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 29 Aug 2017 19:27:58 +0000 (15:27 -0400)
Confirmed with the hw team.  It's the same for all asics.

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

index 7754846..6666fcd 100644 (file)
@@ -4622,12 +4622,10 @@ static int gfx_v8_0_mqd_init(struct amdgpu_ring *ring)
        mqd->compute_static_thread_mgmt_se2 = 0xffffffff;
        mqd->compute_static_thread_mgmt_se3 = 0xffffffff;
        mqd->compute_misc_reserved = 0x00000003;
-       if (!(adev->flags & AMD_IS_APU)) {
-               mqd->dynamic_cu_mask_addr_lo = lower_32_bits(ring->mqd_gpu_addr
-                                            + offsetof(struct vi_mqd_allocation, dynamic_cu_mask));
-               mqd->dynamic_cu_mask_addr_hi = upper_32_bits(ring->mqd_gpu_addr
-                                            + offsetof(struct vi_mqd_allocation, dynamic_cu_mask));
-       }
+       mqd->dynamic_cu_mask_addr_lo = lower_32_bits(ring->mqd_gpu_addr
+                                                    + offsetof(struct vi_mqd_allocation, dynamic_cu_mask));
+       mqd->dynamic_cu_mask_addr_hi = upper_32_bits(ring->mqd_gpu_addr
+                                                    + offsetof(struct vi_mqd_allocation, dynamic_cu_mask));
        eop_base_addr = ring->eop_gpu_addr >> 8;
        mqd->cp_hqd_eop_base_addr_lo = eop_base_addr;
        mqd->cp_hqd_eop_base_addr_hi = upper_32_bits(eop_base_addr);