i915_sysfs.c 16.0 KB
Newer Older
B
Ben Widawsky 已提交
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
/*
 * Copyright © 2012 Intel Corporation
 *
 * 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 (including the next
 * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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 Widawsky <ben@bwidawsk.net>
 *
 */

#include <linux/device.h>
#include <linux/module.h>
#include <linux/stat.h>
#include <linux/sysfs.h>
32
#include "intel_drv.h"
B
Ben Widawsky 已提交
33 34
#include "i915_drv.h"

35
#ifdef CONFIG_PM
B
Ben Widawsky 已提交
36 37 38 39 40 41 42 43
static u32 calc_residency(struct drm_device *dev, const u32 reg)
{
	struct drm_i915_private *dev_priv = dev->dev_private;
	u64 raw_time; /* 32b value may overflow during fixed point math */

	if (!intel_enable_rc6(dev))
		return 0;

44 45
	raw_time = I915_READ(reg) * 128ULL;
	return DIV_ROUND_UP_ULL(raw_time, 100000);
B
Ben Widawsky 已提交
46 47 48
}

static ssize_t
B
Ben Widawsky 已提交
49
show_rc6_mask(struct device *kdev, struct device_attribute *attr, char *buf)
B
Ben Widawsky 已提交
50
{
B
Ben Widawsky 已提交
51
	struct drm_minor *dminor = container_of(kdev, struct drm_minor, kdev);
52
	return snprintf(buf, PAGE_SIZE, "%x\n", intel_enable_rc6(dminor->dev));
B
Ben Widawsky 已提交
53 54 55
}

static ssize_t
B
Ben Widawsky 已提交
56
show_rc6_ms(struct device *kdev, struct device_attribute *attr, char *buf)
B
Ben Widawsky 已提交
57
{
B
Ben Widawsky 已提交
58
	struct drm_minor *dminor = container_of(kdev, struct drm_minor, kdev);
B
Ben Widawsky 已提交
59
	u32 rc6_residency = calc_residency(dminor->dev, GEN6_GT_GFX_RC6);
60
	return snprintf(buf, PAGE_SIZE, "%u\n", rc6_residency);
B
Ben Widawsky 已提交
61 62 63
}

static ssize_t
B
Ben Widawsky 已提交
64
show_rc6p_ms(struct device *kdev, struct device_attribute *attr, char *buf)
B
Ben Widawsky 已提交
65
{
B
Ben Widawsky 已提交
66
	struct drm_minor *dminor = container_of(kdev, struct drm_minor, kdev);
B
Ben Widawsky 已提交
67
	u32 rc6p_residency = calc_residency(dminor->dev, GEN6_GT_GFX_RC6p);
68
	return snprintf(buf, PAGE_SIZE, "%u\n", rc6p_residency);
B
Ben Widawsky 已提交
69 70 71
}

static ssize_t
B
Ben Widawsky 已提交
72
show_rc6pp_ms(struct device *kdev, struct device_attribute *attr, char *buf)
B
Ben Widawsky 已提交
73
{
B
Ben Widawsky 已提交
74
	struct drm_minor *dminor = container_of(kdev, struct drm_minor, kdev);
B
Ben Widawsky 已提交
75
	u32 rc6pp_residency = calc_residency(dminor->dev, GEN6_GT_GFX_RC6pp);
76
	return snprintf(buf, PAGE_SIZE, "%u\n", rc6pp_residency);
B
Ben Widawsky 已提交
77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
}

static DEVICE_ATTR(rc6_enable, S_IRUGO, show_rc6_mask, NULL);
static DEVICE_ATTR(rc6_residency_ms, S_IRUGO, show_rc6_ms, NULL);
static DEVICE_ATTR(rc6p_residency_ms, S_IRUGO, show_rc6p_ms, NULL);
static DEVICE_ATTR(rc6pp_residency_ms, S_IRUGO, show_rc6pp_ms, NULL);

static struct attribute *rc6_attrs[] = {
	&dev_attr_rc6_enable.attr,
	&dev_attr_rc6_residency_ms.attr,
	&dev_attr_rc6p_residency_ms.attr,
	&dev_attr_rc6pp_residency_ms.attr,
	NULL
};

static struct attribute_group rc6_attr_group = {
	.name = power_group_name,
	.attrs =  rc6_attrs
};
96
#endif
B
Ben Widawsky 已提交
97

98 99
static int l3_access_valid(struct drm_device *dev, loff_t offset)
{
100
	if (!HAS_L3_GPU_CACHE(dev))
101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120
		return -EPERM;

	if (offset % 4 != 0)
		return -EINVAL;

	if (offset >= GEN7_L3LOG_SIZE)
		return -ENXIO;

	return 0;
}

static ssize_t
i915_l3_read(struct file *filp, struct kobject *kobj,
	     struct bin_attribute *attr, char *buf,
	     loff_t offset, size_t count)
{
	struct device *dev = container_of(kobj, struct device, kobj);
	struct drm_minor *dminor = container_of(dev, struct drm_minor, kdev);
	struct drm_device *drm_dev = dminor->dev;
	struct drm_i915_private *dev_priv = drm_dev->dev_private;
121
	int slice = (int)(uintptr_t)attr->private;
122
	int ret;
123

124 125
	count = round_down(count, 4);

126 127 128 129
	ret = l3_access_valid(drm_dev, offset);
	if (ret)
		return ret;

130 131
	count = min_t(int, GEN7_L3LOG_SIZE-offset, count);

132 133 134 135
	ret = i915_mutex_lock_interruptible(drm_dev);
	if (ret)
		return ret;

136 137 138 139 140 141
	if (dev_priv->l3_parity.remap_info[slice])
		memcpy(buf,
		       dev_priv->l3_parity.remap_info[slice] + (offset/4),
		       count);
	else
		memset(buf, 0, count);
142 143 144

	mutex_unlock(&drm_dev->struct_mutex);

B
Ben Widawsky 已提交
145
	return count;
146 147 148 149 150 151 152 153 154 155 156
}

static ssize_t
i915_l3_write(struct file *filp, struct kobject *kobj,
	      struct bin_attribute *attr, char *buf,
	      loff_t offset, size_t count)
{
	struct device *dev = container_of(kobj, struct device, kobj);
	struct drm_minor *dminor = container_of(dev, struct drm_minor, kdev);
	struct drm_device *drm_dev = dminor->dev;
	struct drm_i915_private *dev_priv = drm_dev->dev_private;
157
	struct i915_hw_context *ctx;
158
	u32 *temp = NULL; /* Just here to make handling failures easy */
159
	int slice = (int)(uintptr_t)attr->private;
160 161 162 163 164 165
	int ret;

	ret = l3_access_valid(drm_dev, offset);
	if (ret)
		return ret;

166 167 168
	if (dev_priv->hw_contexts_disabled)
		return -ENXIO;

169 170 171 172
	ret = i915_mutex_lock_interruptible(drm_dev);
	if (ret)
		return ret;

173
	if (!dev_priv->l3_parity.remap_info[slice]) {
174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192
		temp = kzalloc(GEN7_L3LOG_SIZE, GFP_KERNEL);
		if (!temp) {
			mutex_unlock(&drm_dev->struct_mutex);
			return -ENOMEM;
		}
	}

	ret = i915_gpu_idle(drm_dev);
	if (ret) {
		kfree(temp);
		mutex_unlock(&drm_dev->struct_mutex);
		return ret;
	}

	/* TODO: Ideally we really want a GPU reset here to make sure errors
	 * aren't propagated. Since I cannot find a stable way to reset the GPU
	 * at this point it is left as a TODO.
	*/
	if (temp)
193
		dev_priv->l3_parity.remap_info[slice] = temp;
194

195
	memcpy(dev_priv->l3_parity.remap_info[slice] + (offset/4), buf, count);
196

197 198 199
	/* NB: We defer the remapping until we switch to the context */
	list_for_each_entry(ctx, &dev_priv->context_list, link)
		ctx->remap_slice |= (1<<slice);
200 201 202 203 204 205 206 207 208 209 210

	mutex_unlock(&drm_dev->struct_mutex);

	return count;
}

static struct bin_attribute dpf_attrs = {
	.attr = {.name = "l3_parity", .mode = (S_IRUSR | S_IWUSR)},
	.size = GEN7_L3LOG_SIZE,
	.read = i915_l3_read,
	.write = i915_l3_write,
211 212 213 214 215 216 217 218 219 220 221
	.mmap = NULL,
	.private = (void *)0
};

static struct bin_attribute dpf_attrs_1 = {
	.attr = {.name = "l3_parity_slice_1", .mode = (S_IRUSR | S_IWUSR)},
	.size = GEN7_L3LOG_SIZE,
	.read = i915_l3_read,
	.write = i915_l3_write,
	.mmap = NULL,
	.private = (void *)1
222 223
};

224 225 226 227 228 229 230 231
static ssize_t gt_cur_freq_mhz_show(struct device *kdev,
				    struct device_attribute *attr, char *buf)
{
	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
	struct drm_device *dev = minor->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
	int ret;

232
	mutex_lock(&dev_priv->rps.hw_lock);
233 234
	if (IS_VALLEYVIEW(dev_priv->dev)) {
		u32 freq;
235
		freq = vlv_punit_read(dev_priv, PUNIT_REG_GPU_FREQ_STS);
236 237
		ret = vlv_gpu_freq(dev_priv->mem_freq, (freq >> 8) & 0xff);
	} else {
238
		ret = dev_priv->rps.cur_delay * GT_FREQUENCY_MULTIPLIER;
239
	}
240
	mutex_unlock(&dev_priv->rps.hw_lock);
241

242
	return snprintf(buf, PAGE_SIZE, "%d\n", ret);
243 244
}

245 246 247 248 249 250 251 252 253 254 255 256
static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,
				     struct device_attribute *attr, char *buf)
{
	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
	struct drm_device *dev = minor->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;

	return snprintf(buf, PAGE_SIZE, "%d\n",
			vlv_gpu_freq(dev_priv->mem_freq,
				     dev_priv->rps.rpe_delay));
}

257 258 259 260 261 262 263
static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf)
{
	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
	struct drm_device *dev = minor->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
	int ret;

264
	mutex_lock(&dev_priv->rps.hw_lock);
265 266 267 268
	if (IS_VALLEYVIEW(dev_priv->dev))
		ret = vlv_gpu_freq(dev_priv->mem_freq, dev_priv->rps.max_delay);
	else
		ret = dev_priv->rps.max_delay * GT_FREQUENCY_MULTIPLIER;
269
	mutex_unlock(&dev_priv->rps.hw_lock);
270

271
	return snprintf(buf, PAGE_SIZE, "%d\n", ret);
272 273
}

274 275 276 277 278 279 280
static ssize_t gt_max_freq_mhz_store(struct device *kdev,
				     struct device_attribute *attr,
				     const char *buf, size_t count)
{
	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
	struct drm_device *dev = minor->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
281
	u32 val, rp_state_cap, hw_max, hw_min, non_oc_max;
282 283 284 285 286 287
	ssize_t ret;

	ret = kstrtou32(buf, 0, &val);
	if (ret)
		return ret;

288
	mutex_lock(&dev_priv->rps.hw_lock);
289

290 291 292 293 294 295 296 297
	if (IS_VALLEYVIEW(dev_priv->dev)) {
		val = vlv_freq_opcode(dev_priv->mem_freq, val);

		hw_max = valleyview_rps_max_freq(dev_priv);
		hw_min = valleyview_rps_min_freq(dev_priv);
		non_oc_max = hw_max;
	} else {
		val /= GT_FREQUENCY_MULTIPLIER;
298

299 300 301 302 303 304 305 306
		rp_state_cap = I915_READ(GEN6_RP_STATE_CAP);
		hw_max = dev_priv->rps.hw_max;
		non_oc_max = (rp_state_cap & 0xff);
		hw_min = ((rp_state_cap & 0xff0000) >> 16);
	}

	if (val < hw_min || val > hw_max ||
	    val < dev_priv->rps.min_delay) {
307
		mutex_unlock(&dev_priv->rps.hw_lock);
308 309 310
		return -EINVAL;
	}

311 312 313 314
	if (val > non_oc_max)
		DRM_DEBUG("User requested overclocking to %d\n",
			  val * GT_FREQUENCY_MULTIPLIER);

315 316 317 318 319 320
	if (dev_priv->rps.cur_delay > val) {
		if (IS_VALLEYVIEW(dev_priv->dev))
			valleyview_set_rps(dev_priv->dev, val);
		else
			gen6_set_rps(dev_priv->dev, val);
	}
321 322 323

	dev_priv->rps.max_delay = val;

324
	mutex_unlock(&dev_priv->rps.hw_lock);
325 326 327 328

	return count;
}

329 330 331 332 333 334 335
static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf)
{
	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
	struct drm_device *dev = minor->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
	int ret;

336
	mutex_lock(&dev_priv->rps.hw_lock);
337 338 339 340
	if (IS_VALLEYVIEW(dev_priv->dev))
		ret = vlv_gpu_freq(dev_priv->mem_freq, dev_priv->rps.min_delay);
	else
		ret = dev_priv->rps.min_delay * GT_FREQUENCY_MULTIPLIER;
341
	mutex_unlock(&dev_priv->rps.hw_lock);
342

343
	return snprintf(buf, PAGE_SIZE, "%d\n", ret);
344 345
}

346 347 348 349 350 351 352 353 354 355 356 357 358 359
static ssize_t gt_min_freq_mhz_store(struct device *kdev,
				     struct device_attribute *attr,
				     const char *buf, size_t count)
{
	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
	struct drm_device *dev = minor->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
	u32 val, rp_state_cap, hw_max, hw_min;
	ssize_t ret;

	ret = kstrtou32(buf, 0, &val);
	if (ret)
		return ret;

360
	mutex_lock(&dev_priv->rps.hw_lock);
361

362 363 364 365 366 367 368 369 370 371 372 373
	if (IS_VALLEYVIEW(dev)) {
		val = vlv_freq_opcode(dev_priv->mem_freq, val);

		hw_max = valleyview_rps_max_freq(dev_priv);
		hw_min = valleyview_rps_min_freq(dev_priv);
	} else {
		val /= GT_FREQUENCY_MULTIPLIER;

		rp_state_cap = I915_READ(GEN6_RP_STATE_CAP);
		hw_max = dev_priv->rps.hw_max;
		hw_min = ((rp_state_cap & 0xff0000) >> 16);
	}
374 375

	if (val < hw_min || val > hw_max || val > dev_priv->rps.max_delay) {
376
		mutex_unlock(&dev_priv->rps.hw_lock);
377 378 379
		return -EINVAL;
	}

380 381 382 383 384 385
	if (dev_priv->rps.cur_delay < val) {
		if (IS_VALLEYVIEW(dev))
			valleyview_set_rps(dev, val);
		else
			gen6_set_rps(dev_priv->dev, val);
	}
386 387 388

	dev_priv->rps.min_delay = val;

389
	mutex_unlock(&dev_priv->rps.hw_lock);
390 391 392 393 394

	return count;

}

395
static DEVICE_ATTR(gt_cur_freq_mhz, S_IRUGO, gt_cur_freq_mhz_show, NULL);
396 397
static DEVICE_ATTR(gt_max_freq_mhz, S_IRUGO | S_IWUSR, gt_max_freq_mhz_show, gt_max_freq_mhz_store);
static DEVICE_ATTR(gt_min_freq_mhz, S_IRUGO | S_IWUSR, gt_min_freq_mhz_show, gt_min_freq_mhz_store);
398

399
static DEVICE_ATTR(vlv_rpe_freq_mhz, S_IRUGO, vlv_rpe_freq_mhz_show, NULL);
400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429

static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf);
static DEVICE_ATTR(gt_RP0_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL);
static DEVICE_ATTR(gt_RP1_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL);
static DEVICE_ATTR(gt_RPn_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL);

/* For now we have a static number of RP states */
static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf)
{
	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
	struct drm_device *dev = minor->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
	u32 val, rp_state_cap;
	ssize_t ret;

	ret = mutex_lock_interruptible(&dev->struct_mutex);
	if (ret)
		return ret;
	rp_state_cap = I915_READ(GEN6_RP_STATE_CAP);
	mutex_unlock(&dev->struct_mutex);

	if (attr == &dev_attr_gt_RP0_freq_mhz) {
		val = ((rp_state_cap & 0x0000ff) >> 0) * GT_FREQUENCY_MULTIPLIER;
	} else if (attr == &dev_attr_gt_RP1_freq_mhz) {
		val = ((rp_state_cap & 0x00ff00) >> 8) * GT_FREQUENCY_MULTIPLIER;
	} else if (attr == &dev_attr_gt_RPn_freq_mhz) {
		val = ((rp_state_cap & 0xff0000) >> 16) * GT_FREQUENCY_MULTIPLIER;
	} else {
		BUG();
	}
430
	return snprintf(buf, PAGE_SIZE, "%d\n", val);
431 432
}

433 434 435 436
static const struct attribute *gen6_attrs[] = {
	&dev_attr_gt_cur_freq_mhz.attr,
	&dev_attr_gt_max_freq_mhz.attr,
	&dev_attr_gt_min_freq_mhz.attr,
437 438 439
	&dev_attr_gt_RP0_freq_mhz.attr,
	&dev_attr_gt_RP1_freq_mhz.attr,
	&dev_attr_gt_RPn_freq_mhz.attr,
440 441 442
	NULL,
};

443 444 445 446 447 448 449 450
static const struct attribute *vlv_attrs[] = {
	&dev_attr_gt_cur_freq_mhz.attr,
	&dev_attr_gt_max_freq_mhz.attr,
	&dev_attr_gt_min_freq_mhz.attr,
	&dev_attr_vlv_rpe_freq_mhz.attr,
	NULL,
};

451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515
static ssize_t error_state_read(struct file *filp, struct kobject *kobj,
				struct bin_attribute *attr, char *buf,
				loff_t off, size_t count)
{

	struct device *kdev = container_of(kobj, struct device, kobj);
	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
	struct drm_device *dev = minor->dev;
	struct i915_error_state_file_priv error_priv;
	struct drm_i915_error_state_buf error_str;
	ssize_t ret_count = 0;
	int ret;

	memset(&error_priv, 0, sizeof(error_priv));

	ret = i915_error_state_buf_init(&error_str, count, off);
	if (ret)
		return ret;

	error_priv.dev = dev;
	i915_error_state_get(dev, &error_priv);

	ret = i915_error_state_to_str(&error_str, &error_priv);
	if (ret)
		goto out;

	ret_count = count < error_str.bytes ? count : error_str.bytes;

	memcpy(buf, error_str.buf, ret_count);
out:
	i915_error_state_put(&error_priv);
	i915_error_state_buf_release(&error_str);

	return ret ?: ret_count;
}

static ssize_t error_state_write(struct file *file, struct kobject *kobj,
				 struct bin_attribute *attr, char *buf,
				 loff_t off, size_t count)
{
	struct device *kdev = container_of(kobj, struct device, kobj);
	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
	struct drm_device *dev = minor->dev;
	int ret;

	DRM_DEBUG_DRIVER("Resetting error state\n");

	ret = mutex_lock_interruptible(&dev->struct_mutex);
	if (ret)
		return ret;

	i915_destroy_error_state(dev);
	mutex_unlock(&dev->struct_mutex);

	return count;
}

static struct bin_attribute error_state_attr = {
	.attr.name = "error",
	.attr.mode = S_IRUSR | S_IWUSR,
	.size = 0,
	.read = error_state_read,
	.write = error_state_write,
};

B
Ben Widawsky 已提交
516 517 518 519
void i915_setup_sysfs(struct drm_device *dev)
{
	int ret;

520
#ifdef CONFIG_PM
521 522 523 524 525 526
	if (INTEL_INFO(dev)->gen >= 6) {
		ret = sysfs_merge_group(&dev->primary->kdev.kobj,
					&rc6_attr_group);
		if (ret)
			DRM_ERROR("RC6 residency sysfs setup failed\n");
	}
527
#endif
528
	if (HAS_L3_GPU_CACHE(dev)) {
529 530 531
		ret = device_create_bin_file(&dev->primary->kdev, &dpf_attrs);
		if (ret)
			DRM_ERROR("l3 parity sysfs setup failed\n");
532 533 534 535 536 537 538

		if (NUM_L3_SLICES(dev) > 1) {
			ret = device_create_bin_file(&dev->primary->kdev,
						     &dpf_attrs_1);
			if (ret)
				DRM_ERROR("l3 parity slice 1 setup failed\n");
		}
539
	}
540

541 542 543 544
	ret = 0;
	if (IS_VALLEYVIEW(dev))
		ret = sysfs_create_files(&dev->primary->kdev.kobj, vlv_attrs);
	else if (INTEL_INFO(dev)->gen >= 6)
545
		ret = sysfs_create_files(&dev->primary->kdev.kobj, gen6_attrs);
546 547
	if (ret)
		DRM_ERROR("RPS sysfs setup failed\n");
548 549 550 551 552

	ret = sysfs_create_bin_file(&dev->primary->kdev.kobj,
				    &error_state_attr);
	if (ret)
		DRM_ERROR("error_state sysfs setup failed\n");
B
Ben Widawsky 已提交
553 554 555 556
}

void i915_teardown_sysfs(struct drm_device *dev)
{
557
	sysfs_remove_bin_file(&dev->primary->kdev.kobj, &error_state_attr);
558 559 560 561
	if (IS_VALLEYVIEW(dev))
		sysfs_remove_files(&dev->primary->kdev.kobj, vlv_attrs);
	else
		sysfs_remove_files(&dev->primary->kdev.kobj, gen6_attrs);
562
	device_remove_bin_file(&dev->primary->kdev,  &dpf_attrs_1);
563
	device_remove_bin_file(&dev->primary->kdev,  &dpf_attrs);
564
#ifdef CONFIG_PM
B
Ben Widawsky 已提交
565
	sysfs_unmerge_group(&dev->primary->kdev.kobj, &rc6_attr_group);
566
#endif
B
Ben Widawsky 已提交
567
}