| From 695d0eb277f53695fdb68df99f9f47a8e98bfb20 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 16 Sep 2020 13:03:50 -0400 |
| Subject: drm/amdgpu: No sysfs, not an error condition |
| |
| From: Luben Tuikov <luben.tuikov@amd.com> |
| |
| [ Upstream commit 5aea5327ea2ddf544cbeff096f45fc2319b0714e ] |
| |
| Not being able to create amdgpu sysfs attributes |
| is not a fatal error warranting not to continue |
| to try to bring up the display. Thus, if we get |
| an error trying to create amdgpu sysfs attrs, |
| report it and continue on to try to bring up |
| a display. |
| |
| Signed-off-by: Luben Tuikov <luben.tuikov@amd.com> |
| Acked-by: Slava Abramov <slava.abramov@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
| index d0b8d0d341af5..2576c299958c5 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
| @@ -3316,10 +3316,8 @@ fence_driver_init: |
| flush_delayed_work(&adev->delayed_init_work); |
| |
| r = sysfs_create_files(&adev->dev->kobj, amdgpu_dev_attributes); |
| - if (r) { |
| + if (r) |
| dev_err(adev->dev, "Could not create amdgpu device attr\n"); |
| - return r; |
| - } |
| |
| if (IS_ENABLED(CONFIG_PERF_EVENTS)) |
| r = amdgpu_pmu_init(adev); |
| -- |
| 2.27.0 |
| |