lkml.org 
[lkml]   [2019]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.20 068/105] drm/amdkfd: Don't assign dGPUs to APU topology devices
    Date
    From: Felix Kuehling <Felix.Kuehling@amd.com>

    [ Upstream commit bbdf514fe5648566b0754476cbcb92ac3422dde2 ]

    dGPUs need their own topology devices. Don't assign them to APU topology
    devices with CPU cores.

    Bug: https://github.com/RadeonOpenCompute/ROCK-Kernel-Driver/issues/66
    Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
    Tested-by: Elias Konstantinidis <ekondis@gmail.com>
    Acked-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
    index e3843c5929ed..fffece5e42c5 100644
    --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
    +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
    @@ -1074,8 +1074,6 @@ static uint32_t kfd_generate_gpu_id(struct kfd_dev *gpu)
    * the GPU device is not already present in the topology device
    * list then return NULL. This means a new topology device has to
    * be created for this GPU.
    - * TODO: Rather than assiging @gpu to first topology device withtout
    - * gpu attached, it will better to have more stringent check.
    */
    static struct kfd_topology_device *kfd_assign_gpu(struct kfd_dev *gpu)
    {
    @@ -1083,12 +1081,20 @@ static struct kfd_topology_device *kfd_assign_gpu(struct kfd_dev *gpu)
    struct kfd_topology_device *out_dev = NULL;

    down_write(&topology_lock);
    - list_for_each_entry(dev, &topology_device_list, list)
    + list_for_each_entry(dev, &topology_device_list, list) {
    + /* Discrete GPUs need their own topology device list
    + * entries. Don't assign them to CPU/APU nodes.
    + */
    + if (!gpu->device_info->needs_iommu_device &&
    + dev->node_props.cpu_cores_count)
    + continue;
    +
    if (!dev->gpu && (dev->node_props.simd_count > 0)) {
    dev->gpu = gpu;
    out_dev = dev;
    break;
    }
    + }
    up_write(&topology_lock);
    return out_dev;
    }
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-02-13 03:35    [W:4.931 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site