Module Name: src
Committed By: riastradh
Date: Mon Jul 1 12:09:52 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_device.c
Log Message:
amdgpu: Map BAR 2, not BAR 5, on pre-bonaire chips.
PR kern/58384
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
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.20 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c:1.21
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c:1.20 Sat Sep 30 10:46:45 2023
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c Mon Jul 1 12:09:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_device.c,v 1.20 2023/09/30 10:46:45 mrg Exp $ */
+/* $NetBSD: amdgpu_device.c,v 1.21 2024/07/01 12:09:52 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.20 2023/09/30 10:46:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.21 2024/07/01 12:09:52 riastradh Exp $");
#include <linux/power_supply.h>
#include <linux/kthread.h>
@@ -3047,9 +3047,10 @@ int amdgpu_device_init(struct amdgpu_dev
}
#ifdef __NetBSD__
- if (pci_mapreg_map(&adev->pdev->pd_pa, PCI_BAR(5),
+ const int bar = (adev->asic_type >= CHIP_BONAIRE ? 5 : 2);
+ if (pci_mapreg_map(&adev->pdev->pd_pa, PCI_BAR(bar),
pci_mapreg_type(adev->pdev->pd_pa.pa_pc,
- adev->pdev->pd_pa.pa_tag, PCI_BAR(5)),
+ adev->pdev->pd_pa.pa_tag, PCI_BAR(bar)),
0,
&adev->rmmiot, &adev->rmmioh,
&adev->rmmio_base, &adev->rmmio_size))
