[src/trunk]: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu amdgpu: Fix mostly...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6ac2416adeaa
branches:  trunk
changeset: 375994:6ac2416adeaa
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu May 25 12:07:43 2023 +0000

description:
amdgpu: Fix mostly harmless merge botch.

Avoids confusing error message that should have been confined to an
error branch.

diffstat:

 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 62ab58d74d3a -r 6ac2416adeaa sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c Thu May 25 06:17:18 2023 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c Thu May 25 12:07:43 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_device.c,v 1.18 2023/02/21 11:39:39 riastradh Exp $     */
+/*     $NetBSD: amdgpu_device.c,v 1.19 2023/05/25 12:07:43 riastradh 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.18 2023/02/21 11:39:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.19 2023/05/25 12:07:43 riastradh 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