drm/nouveau/sysfs: remove pstate interface (fcc95ce9) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/gpu/drm/nouveau/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ nouveau-y += nouveau_hwmon.o
		nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
		nouveau-y += nouveau_nvif.o
		nouveau-$(CONFIG_NOUVEAU_PLATFORM_DRIVER) += nouveau_platform.o
		nouveau-y += nouveau_sysfs.o
		nouveau-y += nouveau_usif.o # userspace <-> nvif
		nouveau-y += nouveau_vga.o

drivers/gpu/drm/nouveau/nouveau_drm.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@
		#include "nouveau_ttm.h"
		#include "nouveau_gem.h"
		#include "nouveau_vga.h"
		#include "nouveau_sysfs.h"
		#include "nouveau_hwmon.h"
		#include "nouveau_acpi.h"
		#include "nouveau_bios.h"
		@@ -454,7 +453,6 @@ nouveau_drm_load(struct drm_device *dev, unsigned long flags)
		}

		nouveau_debugfs_init(drm);
		nouveau_sysfs_init(dev);
		nouveau_hwmon_init(dev);
		nouveau_accel_init(drm);
		nouveau_fbcon_init(dev);
		@@ -492,7 +490,6 @@ nouveau_drm_unload(struct drm_device *dev)
		nouveau_fbcon_fini(dev);
		nouveau_accel_fini(drm);
		nouveau_hwmon_fini(dev);
		nouveau_sysfs_fini(dev);
		nouveau_debugfs_fini(drm);

		if (dev->mode_config.num_crtc)
		@@ -1010,7 +1007,6 @@ static void nouveau_display_options(void)
		DRM_DEBUG_DRIVER("... modeset : %d\n", nouveau_modeset);
		DRM_DEBUG_DRIVER("... runpm : %d\n", nouveau_runtime_pm);
		DRM_DEBUG_DRIVER("... vram_pushbuf : %d\n", nouveau_vram_pushbuf);
		DRM_DEBUG_DRIVER("... pstate : %d\n", nouveau_pstate);
		}

		static const struct dev_pm_ops nouveau_pm_ops = {

drivers/gpu/drm/nouveau/nouveau_drm.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,6 @@ struct nouveau_drm {

		/* power management */
		struct nouveau_hwmon *hwmon;
		struct nouveau_sysfs *sysfs;
		struct nouveau_debugfs *debugfs;

		/* display power reference */

drivers/gpu/drm/nouveau/nouveau_sysfs.c

deleted100644 → 0

+0 −198

Original line number	Diff line number	Diff line
		/*
		* Copyright 2013 Red Hat Inc.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
		* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
		* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
		* OTHER DEALINGS IN THE SOFTWARE.
		*
		* Authors: Ben Skeggs <bskeggs@redhat.com>
		*/

		#include <nvif/os.h>
		#include <nvif/class.h>
		#include <nvif/if0001.h>
		#include <nvif/ioctl.h>

		#include "nouveau_sysfs.h"

		MODULE_PARM_DESC(pstate, "enable sysfs pstate file, which will be moved in the future");
		int nouveau_pstate;
		module_param_named(pstate, nouveau_pstate, int, 0400);

		static inline struct drm_device *
		drm_device(struct device *d)
		{
		return dev_get_drvdata(d);
		}

		#define snappendf(p,r,f,a...) do { \
		snprintf(p, r, f, ##a); \
		r -= strlen(p); \
		p += strlen(p); \
		} while(0)

		static ssize_t
		nouveau_sysfs_pstate_get(struct device d, struct device_attribute a, char *b)
		{
		struct nouveau_sysfs *sysfs = nouveau_sysfs(drm_device(d));
		struct nvif_control_pstate_info_v0 info = {};
		size_t cnt = PAGE_SIZE;
		char *buf = b;
		int ret, i;

		ret = nvif_mthd(&sysfs->ctrl, NVIF_CONTROL_PSTATE_INFO,
		&info, sizeof(info));
		if (ret)
		return ret;

		for (i = 0; i < info.count + 1; i++) {
		const s32 state = i < info.count ? i :
		NVIF_CONTROL_PSTATE_ATTR_V0_STATE_CURRENT;
		struct nvif_control_pstate_attr_v0 attr = {
		.state = state,
		.index = 0,
		};

		ret = nvif_mthd(&sysfs->ctrl, NVIF_CONTROL_PSTATE_ATTR,
		&attr, sizeof(attr));
		if (ret)
		return ret;

		if (i < info.count)
		snappendf(buf, cnt, "%02x:", attr.state);
		else
		snappendf(buf, cnt, "%s:", info.pwrsrc == 0 ? "DC" :
		info.pwrsrc == 1 ? "AC" :
		"--");

		attr.index = 0;
		do {
		attr.state = state;
		ret = nvif_mthd(&sysfs->ctrl,
		NVIF_CONTROL_PSTATE_ATTR,
		&attr, sizeof(attr));
		if (ret)
		return ret;

		snappendf(buf, cnt, " %s %d", attr.name, attr.min);
		if (attr.min != attr.max)
		snappendf(buf, cnt, "-%d", attr.max);
		snappendf(buf, cnt, " %s", attr.unit);
		} while (attr.index);

		if (state >= 0) {
		if (info.ustate_ac == state)
		snappendf(buf, cnt, " AC");
		if (info.ustate_dc == state)
		snappendf(buf, cnt, " DC");
		if (info.pstate == state)
		snappendf(buf, cnt, " *");
		} else {
		if (info.ustate_ac < -1)
		snappendf(buf, cnt, " AC");
		if (info.ustate_dc < -1)
		snappendf(buf, cnt, " DC");
		}

		snappendf(buf, cnt, "\n");
		}

		return strlen(b);
		}

		static ssize_t
		nouveau_sysfs_pstate_set(struct device d, struct device_attribute a,
		const char *buf, size_t count)
		{
		struct nouveau_sysfs *sysfs = nouveau_sysfs(drm_device(d));
		struct nvif_control_pstate_user_v0 args = { .pwrsrc = -EINVAL };
		long value, ret;
		char *tmp;

		if ((tmp = strchr(buf, '\n')))
		*tmp = '\0';

		if (!strncasecmp(buf, "dc:", 3)) {
		args.pwrsrc = 0;
		buf += 3;
		} else
		if (!strncasecmp(buf, "ac:", 3)) {
		args.pwrsrc = 1;
		buf += 3;
		}

		if (!strcasecmp(buf, "none"))
		args.ustate = NVIF_CONTROL_PSTATE_USER_V0_STATE_UNKNOWN;
		else
		if (!strcasecmp(buf, "auto"))
		args.ustate = NVIF_CONTROL_PSTATE_USER_V0_STATE_PERFMON;
		else {
		ret = kstrtol(buf, 16, &value);
		if (ret)
		return ret;
		args.ustate = value;
		}

		ret = nvif_mthd(&sysfs->ctrl, NVIF_CONTROL_PSTATE_USER,
		&args, sizeof(args));
		if (ret < 0)
		return ret;

		return count;
		}

		static DEVICE_ATTR(pstate, S_IRUGO \| S_IWUSR,
		nouveau_sysfs_pstate_get, nouveau_sysfs_pstate_set);

		void
		nouveau_sysfs_fini(struct drm_device *dev)
		{
		struct nouveau_sysfs *sysfs = nouveau_sysfs(dev);
		struct nouveau_drm *drm = nouveau_drm(dev);
		struct nvif_device *device = &drm->device;

		if (sysfs && sysfs->ctrl.priv) {
		device_remove_file(nvxx_device(device)->dev, &dev_attr_pstate);
		nvif_object_fini(&sysfs->ctrl);
		}

		drm->sysfs = NULL;
		kfree(sysfs);
		}

		int
		nouveau_sysfs_init(struct drm_device *dev)
		{
		struct nouveau_drm *drm = nouveau_drm(dev);
		struct nvif_device *device = &drm->device;
		struct nouveau_sysfs *sysfs;
		int ret;

		if (!nouveau_pstate)
		return 0;

		sysfs = drm->sysfs = kzalloc(sizeof(*sysfs), GFP_KERNEL);
		if (!sysfs)
		return -ENOMEM;

		ret = nvif_object_init(&device->object, 0, NVIF_CLASS_CONTROL,
		NULL, 0, &sysfs->ctrl);
		if (ret == 0)
		device_create_file(nvxx_device(device)->dev, &dev_attr_pstate);

		return 0;
		}

drivers/gpu/drm/nouveau/nouveau_sysfs.h

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		#ifndef __NOUVEAU_SYSFS_H__
		#define __NOUVEAU_SYSFS_H__

		#include "nouveau_drm.h"

		struct nouveau_sysfs {
		struct nvif_object ctrl;
		};

		static inline struct nouveau_sysfs *
		nouveau_sysfs(struct drm_device *dev)
		{
		return nouveau_drm(dev)->sysfs;
		}

		int nouveau_sysfs_init(struct drm_device *);
		void nouveau_sysfs_fini(struct drm_device *);

		extern int nouveau_pstate;

		#endif