Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon ifdef out pcie_get_spe...
details: https://anonhg.NetBSD.org/src/rev/81f22112b8bd
branches: trunk
changeset: 1028252:81f22112b8bd
user: riastradh <riastradh%NetBSD.org@localhost>
date: Sun Dec 19 09:56:36 2021 +0000
description:
ifdef out pcie_get_speed_cap for now
(You're not seeing double, it appears twice.)
Author: Maya Rashish <maya%NetBSD.org@localhost>
diffstat:
sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diffs (39 lines):
diff -r 4c7c7ac2dcc3 -r 81f22112b8bd sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c Sun Dec 19 09:56:27 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c Sun Dec 19 09:56:36 2021 +0000
@@ -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 @@
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 @@
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 {
Home |
Main Index |
Thread Index |
Old Index