Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:56:36 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_si_dpm.c
Log Message:
ifdef out pcie_get_speed_cap for now
(You're not seeing double, it appears twice.)
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.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/radeon/radeon_si_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.6 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.6 Sun Dec 19 01:50:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c Sun Dec 19 09:56:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_si_dpm.c,v 1.6 2021/12/19 01:50:00 riastradh Exp $ */
+/* $NetBSD: radeon_si_dpm.c,v 1.7 2021/12/19 09:56:36 riastradh Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.6 2021/12/19 01:50:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.7 2021/12/19 09:56:36 riastradh Exp $");
#include <linux/math64.h>
#include <linux/pci.h>
@@ -6907,8 +6907,8 @@ int si_dpm_init(struct radeon_device *rd
struct ni_power_info *ni_pi;
struct si_power_info *si_pi;
struct atom_clock_dividers dividers;
-#ifndef __NetBSD__ /* XXX radeon pcie */
enum pci_bus_speed speed_cap = PCI_SPEED_UNKNOWN;
+#ifdef __linux__ /* XXX radeon pcie */
struct pci_dev *root = rdev->pdev->bus->self;
#endif
int ret;
@@ -6921,8 +6921,10 @@ int si_dpm_init(struct radeon_device *rd
eg_pi = &ni_pi->eg;
pi = &eg_pi->rv7xx;
+#ifdef __linux__
if (!pci_is_root_bus(rdev->pdev->bus))
speed_cap = pcie_get_speed_cap(root);
+#endif
if (speed_cap == PCI_SPEED_UNKNOWN) {
si_pi->sys_pcie_mask = 0;
} else {
