Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:38:49 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_irq.c
Log Message:
amdgpu: Try turning on MSI.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_irq.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_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_irq.c:1.8 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_irq.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_irq.c:1.8 Sun Dec 19 12:31:45 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_irq.c Sun Dec 19 12:38:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_irq.c,v 1.8 2021/12/19 12:31:45 riastradh Exp $ */
+/* $NetBSD: amdgpu_irq.c,v 1.9 2021/12/19 12:38:49 riastradh Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_irq.c,v 1.8 2021/12/19 12:31:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_irq.c,v 1.9 2021/12/19 12:38:49 riastradh Exp $");
#include <linux/irq.h>
#include <linux/pci.h>
@@ -253,7 +253,14 @@ int amdgpu_irq_init(struct amdgpu_device
adev->irq.msi_enabled = false;
if (amdgpu_msi_ok(adev)) {
-#ifndef __NetBSD__ /* XXX amdgpu msix */
+#ifdef __NetBSD__ /* XXX amdgpu msix */
+ if (pci_enable_msi(adev->pdev) == 0) {
+ adev->irq.msi_enabled = true;
+ dev_dbg(adev->dev, "amdgpu: using MSI/MSI-X.\n");
+ } else {
+ dev_err(adev->dev, "amdgpu: failed to enable MSI\n");
+ }
+#else
int nvec = pci_msix_vec_count(adev->pdev);
unsigned int flags;
