OSDN Git Service

drm/amdkfd: Delete duplicated queue bit map reservation
authorYong Zhao <Yong.Zhao@amd.com>
Thu, 24 Oct 2019 21:05:57 +0000 (17:05 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 30 Oct 2019 15:06:51 +0000 (11:06 -0400)
The KIQ is on the second MEC and its reservation is covered in the
latter logic, so no need to reserve its bit twice.

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

index 8c53179..d3da9dd 100644 (file)
@@ -130,14 +130,6 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
                                  adev->gfx.mec.queue_bitmap,
                                  KGD_MAX_QUEUES);
 
-               /* remove the KIQ bit as well */
-               if (adev->gfx.kiq.ring.sched.ready)
-                       clear_bit(amdgpu_gfx_mec_queue_to_bit(adev,
-                                                         adev->gfx.kiq.ring.me - 1,
-                                                         adev->gfx.kiq.ring.pipe,
-                                                         adev->gfx.kiq.ring.queue),
-                                 gpu_resources.queue_bitmap);
-
                /* According to linux/bitmap.h we shouldn't use bitmap_clear if
                 * nbits is not compile time constant
                 */