diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-02-04 14:56:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-02-04 14:57:34 +1000 |
| commit | 148fb2e2e38769d99e3dfafdc03d06eeedcf7ad3 (patch) | |
| tree | 8f2bba99e26341ba20534a69951a9e9792952806 /drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | |
| parent | 37fdaa3390cf3e0fde96941799543e85ea58f6ae (diff) | |
| parent | 47dd8048a1bf5b2fb96e5abe99b4f1dcd208ea4d (diff) | |
| download | linux-148fb2e2e38769d99e3dfafdc03d06eeedcf7ad3.tar.gz linux-148fb2e2e38769d99e3dfafdc03d06eeedcf7ad3.tar.bz2 linux-148fb2e2e38769d99e3dfafdc03d06eeedcf7ad3.zip | |
Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next
ttm:
- Replace ref/unref naming with get/put
amdgpu:
- Revert DC clang fix, causes a segfault with some compiler versions
- SR-IOV fix
- PCIE fix for vega20
- Misc DC fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190201062345.7304-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c index dac187454b33..0d90672d0e58 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c @@ -91,10 +91,6 @@ int amdgpu_xgmi_update_topology(struct amdgpu_hive_info *hive, struct amdgpu_dev "XGMI: Set topology failure on device %llx, hive %llx, ret %d", adev->gmc.xgmi.node_id, adev->gmc.xgmi.hive_id, ret); - else - dev_info(adev->dev, "XGMI: Set topology for node %d, hive 0x%llx.\n", - adev->gmc.xgmi.physical_node_id, - adev->gmc.xgmi.hive_id); return ret; } @@ -160,6 +156,9 @@ int amdgpu_xgmi_add_device(struct amdgpu_device *adev) break; } + dev_info(adev->dev, "XGMI: Add node %d, hive 0x%llx.\n", + adev->gmc.xgmi.physical_node_id, adev->gmc.xgmi.hive_id); + mutex_unlock(&hive->hive_lock); exit: return ret; |