Module Name: src
Committed By: martin
Date: Tue Aug 1 16:14:59 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu [netbsd-10]:
amdgpu_device.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #295):
sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c: revision 1.19
amdgpu: Fix mostly harmless merge botch.
Avoids confusing error message that should have been confined to an
error branch.
To generate a diff of this commit:
cvs rdiff -u -r1.17.4.1 -r1.17.4.2 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c:1.17.4.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c:1.17.4.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c:1.17.4.1 Fri Feb 24 14:11:29 2023
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c Tue Aug 1 16:14:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_device.c,v 1.17.4.1 2023/02/24 14:11:29 martin Exp $ */
+/* $NetBSD: amdgpu_device.c,v 1.17.4.2 2023/08/01 16:14:59 martin Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.17.4.1 2023/02/24 14:11:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.17.4.2 2023/08/01 16:14:59 martin Exp $");
#include <linux/power_supply.h>
#include <linux/kthread.h>
@@ -3085,7 +3085,6 @@ int amdgpu_device_init(struct amdgpu_dev
}
#ifdef __NetBSD__
if (i == DEVICE_COUNT_RESOURCE)
- DRM_ERROR("Unable to find PCI I/O BAR\n");
#else
if (adev->rio_mem == NULL)
#endif
