Skip to content

Commit

Permalink
drm/nouveau: hide sysfs pstate file behind an option again
Browse files Browse the repository at this point in the history
No-one has yet had time to move this to debugfs as discussed during
the last merge window.  Until this happens, hide the option to make
it clear it's not going to be here forever.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Aug 9, 2014
1 parent c354080 commit 0d48b58
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/gpu/drm/nouveau/nouveau_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@

#include "nouveau_sysfs.h"

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

static inline struct drm_device *
drm_device(struct device *d)
{
Expand Down Expand Up @@ -160,7 +164,7 @@ nouveau_sysfs_fini(struct drm_device *dev)
struct nouveau_drm *drm = nouveau_drm(dev);
struct nvif_device *device = &drm->device;

if (sysfs->ctrl.priv) {
if (sysfs && sysfs->ctrl.priv) {
device_remove_file(nv_device_base(nvkm_device(device)), &dev_attr_pstate);
nvif_object_fini(&sysfs->ctrl);
}
Expand All @@ -177,6 +181,9 @@ nouveau_sysfs_init(struct drm_device *dev)
struct nouveau_sysfs *sysfs;
int ret;

if (!nouveau_pstate)
return 0;

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

0 comments on commit 0d48b58

Please sign in to comment.