Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:50:19 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_pm.c
Log Message:
Ifdef out sysfs in ths sisyphean update.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.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_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.c:1.4 Mon Aug 27 04:58:36 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.c Mon Aug 27 07:50:19 2018
@@ -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 <alexdeuc...@gmail.com>
*/
#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 @@ int radeon_pm_late_init(struct radeon_de
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 @@ int radeon_pm_late_init(struct radeon_de
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 @@ int radeon_pm_late_init(struct radeon_de
} 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 @@ int radeon_pm_late_init(struct radeon_de
DRM_ERROR("failed to create device file for power method\n");
if (!ret)
rdev->pm.sysfs_initialized = true;
+#endif
}
}
return ret;
