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 sysfs in ths...
details: https://anonhg.NetBSD.org/src/rev/f99a6a1864d3
branches: trunk
changeset: 992800:f99a6a1864d3
user: riastradh <riastradh%NetBSD.org@localhost>
date: Mon Aug 27 07:50:19 2018 +0000
description:
Ifdef out sysfs in ths sisyphean update.
diffstat:
sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (50 lines):
diff -r 98faa2928b1a -r f99a6a1864d3 sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.c Mon Aug 27 07:50:08 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.c Mon Aug 27 07:50:19 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pm.c,v 1.4 2018/08/27 04:58:36 riastradh Exp $ */
+/* $NetBSD: radeon_pm.c,v 1.5 2018/08/27 07:50:19 riastradh Exp $ */
/*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,7 +23,7 @@
* Alex Deucher <alexdeucher%gmail.com@localhost>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_pm.c,v 1.4 2018/08/27 04:58:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pm.c,v 1.5 2018/08/27 07:50:19 riastradh Exp $");
#include <drm/drmP.h>
#include "radeon.h"
@@ -1555,6 +1555,7 @@
if (rdev->pm.pm_method == PM_METHOD_DPM) {
if (rdev->pm.dpm_enabled) {
+#ifndef __NetBSD__ /* XXX radeon sysfs */
if (!rdev->pm.sysfs_initialized) {
ret = device_create_file(rdev->dev, &dev_attr_power_dpm_state);
if (ret)
@@ -1571,6 +1572,7 @@
DRM_ERROR("failed to create device file for power method\n");
rdev->pm.sysfs_initialized = true;
}
+#endif
mutex_lock(&rdev->pm.mutex);
ret = radeon_dpm_late_enable(rdev);
@@ -1588,6 +1590,7 @@
} else {
if ((rdev->pm.num_power_states > 1) &&
(!rdev->pm.sysfs_initialized)) {
+#ifndef __NetBSD__ /* XXX radeon sysfs */
/* where's the best place to put these? */
ret = device_create_file(rdev->dev, &dev_attr_power_profile);
if (ret)
@@ -1597,6 +1600,7 @@
DRM_ERROR("failed to create device file for power method\n");
if (!ret)
rdev->pm.sysfs_initialized = true;
+#endif
}
}
return ret;
Home |
Main Index |
Thread Index |
Old Index