i915_sysfs.c 16.8 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
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 */
40
	u64 units = 128ULL, div = 100000ULL, bias = 100ULL;
B
Ben Widawsky 已提交
41 42 43 44

	if (!intel_enable_rc6(dev))
		return 0;

45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
	/* On VLV, residency time is in CZ units rather than 1.28us */
	if (IS_VALLEYVIEW(dev)) {
		u32 clkctl2;

		clkctl2 = I915_READ(VLV_CLK_CTL2) >>
			CLK_CTL2_CZCOUNT_30NS_SHIFT;
		if (!clkctl2) {
			WARN(!clkctl2, "bogus CZ count value");
			return 0;
		}
		units = DIV_ROUND_UP_ULL(30ULL * bias, (u64)clkctl2);
		if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)
			units <<= 8;

		div = 1000000ULL * bias;
	}

	raw_time = I915_READ(reg) * units;
	return DIV_ROUND_UP_ULL(raw_time, div);
B
Ben Widawsky 已提交
64 65 66
}

static ssize_t
B
Ben Widawsky 已提交
67
show_rc6_mask(struct device *kdev, struct device_attribute *attr, char *buf)
B
Ben Widawsky 已提交
68
{
B
Ben Widawsky 已提交
69
	struct drm_minor *dminor = container_of(kdev, struct drm_minor, kdev);
70
	return snprintf(buf, PAGE_SIZE, "%x\n", intel_enable_rc6(dminor->dev));
B
Ben Widawsky 已提交
71 72 73
}

static ssize_t
B
Ben Widawsky 已提交
74
show_rc6_ms(struct device *kdev, struct device_attribute *attr, char *buf)
B
Ben Widawsky 已提交
75
{
B
Ben Widawsky 已提交
76
	struct drm_minor *dminor = container_of(kdev, struct drm_minor, kdev);
B
Ben Widawsky 已提交
77
	u32 rc6_residency = calc_residency(dminor->dev, GEN6_GT_GFX_RC6);
78
	return snprintf(buf, PAGE_SIZE, "%u\n", rc6_residency);
B
Ben Widawsky 已提交
79 80 81
}

static ssize_t
B
Ben Widawsky 已提交
82
show_rc6p_ms(struct device *kdev, struct device_attribute *attr, char *buf)
B
Ben Widawsky 已提交
83
{
B
Ben Widawsky 已提交
84
	struct drm_minor *dminor = container_of(kdev, struct drm_minor, kdev);
B
Ben Widawsky 已提交
85
	u32 rc6p_residency = calc_residency(dminor->dev, GEN6_GT_GFX_RC6p);
86 87
	if (IS_VALLEYVIEW(dminor->dev))
		rc6p_residency = 0;
88
	return snprintf(buf, PAGE_SIZE, "%u\n", rc6p_residency);
B
Ben Widawsky 已提交
89 90 91
}

static ssize_t
B
Ben Widawsky 已提交
92
show_rc6pp_ms(struct device *kdev, struct device_attribute *attr, char *buf)
B
Ben Widawsky 已提交
93
{
B
Ben Widawsky 已提交
94
	struct drm_minor *dminor = container_of(kdev, struct drm_minor, kdev);
B
Ben Widawsky 已提交
95
	u32 rc6pp_residency = calc_residency(dminor->dev, GEN6_GT_GFX_RC6pp);
96 97
	if (IS_VALLEYVIEW(dminor->dev))
		rc6pp_residency = 0;
98
	return snprintf(buf, PAGE_SIZE, "%u\n", rc6pp_residency);
B
Ben Widawsky 已提交
99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117
}

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
};
118
#endif
B
Ben Widawsky 已提交
119

120 121
static int l3_access_valid(struct drm_device *dev, loff_t offset)
{
122
	if (!HAS_L3_DPF(dev))
123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142
		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;
143
	int slice = (int)(uintptr_t)attr->private;
144
	int ret;
145

146 147
	count = round_down(count, 4);

148 149 150 151
	ret = l3_access_valid(drm_dev, offset);
	if (ret)
		return ret;

D
Dan Carpenter 已提交
152
	count = min_t(size_t, GEN7_L3LOG_SIZE - offset, count);
153

154 155 156 157
	ret = i915_mutex_lock_interruptible(drm_dev);
	if (ret)
		return ret;

158 159 160 161 162 163
	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);
164 165 166

	mutex_unlock(&drm_dev->struct_mutex);

B
Ben Widawsky 已提交
167
	return count;
168 169 170 171 172 173 174 175 176 177 178
}

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;
179
	struct i915_hw_context *ctx;
180
	u32 *temp = NULL; /* Just here to make handling failures easy */
181
	int slice = (int)(uintptr_t)attr->private;
182 183 184 185 186 187
	int ret;

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

188 189 190
	if (dev_priv->hw_contexts_disabled)
		return -ENXIO;

191 192 193 194
	ret = i915_mutex_lock_interruptible(drm_dev);
	if (ret)
		return ret;

195
	if (!dev_priv->l3_parity.remap_info[slice]) {
196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214
		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)
215
		dev_priv->l3_parity.remap_info[slice] = temp;
216

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

219 220 221
	/* 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);
222 223 224 225 226 227 228 229 230 231 232

	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,
233 234 235 236 237 238 239 240 241 242 243
	.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
244 245
};

246 247 248 249 250 251 252 253
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;

254 255
	flush_delayed_work(&dev_priv->rps.delayed_resume_work);

256
	mutex_lock(&dev_priv->rps.hw_lock);
257 258
	if (IS_VALLEYVIEW(dev_priv->dev)) {
		u32 freq;
259
		freq = vlv_punit_read(dev_priv, PUNIT_REG_GPU_FREQ_STS);
260
		ret = vlv_gpu_freq(dev_priv, (freq >> 8) & 0xff);
261
	} else {
262
		ret = dev_priv->rps.cur_delay * GT_FREQUENCY_MULTIPLIER;
263
	}
264
	mutex_unlock(&dev_priv->rps.hw_lock);
265

266
	return snprintf(buf, PAGE_SIZE, "%d\n", ret);
267 268
}

269 270 271 272 273 274 275 276
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",
277
			vlv_gpu_freq(dev_priv, dev_priv->rps.rpe_delay));
278 279
}

280 281 282 283 284 285 286
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;

287 288
	flush_delayed_work(&dev_priv->rps.delayed_resume_work);

289
	mutex_lock(&dev_priv->rps.hw_lock);
290
	if (IS_VALLEYVIEW(dev_priv->dev))
291
		ret = vlv_gpu_freq(dev_priv, dev_priv->rps.max_delay);
292 293
	else
		ret = dev_priv->rps.max_delay * GT_FREQUENCY_MULTIPLIER;
294
	mutex_unlock(&dev_priv->rps.hw_lock);
295

296
	return snprintf(buf, PAGE_SIZE, "%d\n", ret);
297 298
}

299 300 301 302 303 304 305
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;
306
	u32 val, rp_state_cap, hw_max, hw_min, non_oc_max;
307 308 309 310 311 312
	ssize_t ret;

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

313 314
	flush_delayed_work(&dev_priv->rps.delayed_resume_work);

315
	mutex_lock(&dev_priv->rps.hw_lock);
316

317
	if (IS_VALLEYVIEW(dev_priv->dev)) {
318
		val = vlv_freq_opcode(dev_priv, val);
319 320 321 322 323 324

		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;
325

326 327 328 329 330 331 332 333
		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) {
334
		mutex_unlock(&dev_priv->rps.hw_lock);
335 336 337
		return -EINVAL;
	}

338 339 340 341
	if (val > non_oc_max)
		DRM_DEBUG("User requested overclocking to %d\n",
			  val * GT_FREQUENCY_MULTIPLIER);

342 343 344 345 346 347
	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);
	}
348 349 350

	dev_priv->rps.max_delay = val;

351
	mutex_unlock(&dev_priv->rps.hw_lock);
352 353 354 355

	return count;
}

356 357 358 359 360 361 362
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;

363 364
	flush_delayed_work(&dev_priv->rps.delayed_resume_work);

365
	mutex_lock(&dev_priv->rps.hw_lock);
366
	if (IS_VALLEYVIEW(dev_priv->dev))
367
		ret = vlv_gpu_freq(dev_priv, dev_priv->rps.min_delay);
368 369
	else
		ret = dev_priv->rps.min_delay * GT_FREQUENCY_MULTIPLIER;
370
	mutex_unlock(&dev_priv->rps.hw_lock);
371

372
	return snprintf(buf, PAGE_SIZE, "%d\n", ret);
373 374
}

375 376 377 378 379 380 381 382 383 384 385 386 387 388
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;

389 390
	flush_delayed_work(&dev_priv->rps.delayed_resume_work);

391
	mutex_lock(&dev_priv->rps.hw_lock);
392

393
	if (IS_VALLEYVIEW(dev)) {
394
		val = vlv_freq_opcode(dev_priv, val);
395 396 397 398 399 400 401 402 403 404

		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);
	}
405 406

	if (val < hw_min || val > hw_max || val > dev_priv->rps.max_delay) {
407
		mutex_unlock(&dev_priv->rps.hw_lock);
408 409 410
		return -EINVAL;
	}

411 412 413 414 415 416
	if (dev_priv->rps.cur_delay < val) {
		if (IS_VALLEYVIEW(dev))
			valleyview_set_rps(dev, val);
		else
			gen6_set_rps(dev_priv->dev, val);
	}
417 418 419

	dev_priv->rps.min_delay = val;

420
	mutex_unlock(&dev_priv->rps.hw_lock);
421 422 423 424 425

	return count;

}

426
static DEVICE_ATTR(gt_cur_freq_mhz, S_IRUGO, gt_cur_freq_mhz_show, NULL);
427 428
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);
429

430
static DEVICE_ATTR(vlv_rpe_freq_mhz, S_IRUGO, vlv_rpe_freq_mhz_show, NULL);
431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460

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();
	}
461
	return snprintf(buf, PAGE_SIZE, "%d\n", val);
462 463
}

464 465 466 467
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,
468 469 470
	&dev_attr_gt_RP0_freq_mhz.attr,
	&dev_attr_gt_RP1_freq_mhz.attr,
	&dev_attr_gt_RPn_freq_mhz.attr,
471 472 473
	NULL,
};

474 475 476 477 478 479 480 481
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,
};

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 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546
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 已提交
547 548 549 550
void i915_setup_sysfs(struct drm_device *dev)
{
	int ret;

551
#ifdef CONFIG_PM
552 553 554 555 556 557
	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");
	}
558
#endif
559
	if (HAS_L3_DPF(dev)) {
560 561 562
		ret = device_create_bin_file(&dev->primary->kdev, &dpf_attrs);
		if (ret)
			DRM_ERROR("l3 parity sysfs setup failed\n");
563 564 565 566 567 568 569

		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");
		}
570
	}
571

572 573 574 575
	ret = 0;
	if (IS_VALLEYVIEW(dev))
		ret = sysfs_create_files(&dev->primary->kdev.kobj, vlv_attrs);
	else if (INTEL_INFO(dev)->gen >= 6)
576
		ret = sysfs_create_files(&dev->primary->kdev.kobj, gen6_attrs);
577 578
	if (ret)
		DRM_ERROR("RPS sysfs setup failed\n");
579 580 581 582 583

	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 已提交
584 585 586 587
}

void i915_teardown_sysfs(struct drm_device *dev)
{
588
	sysfs_remove_bin_file(&dev->primary->kdev.kobj, &error_state_attr);
589 590 591 592
	if (IS_VALLEYVIEW(dev))
		sysfs_remove_files(&dev->primary->kdev.kobj, vlv_attrs);
	else
		sysfs_remove_files(&dev->primary->kdev.kobj, gen6_attrs);
593
	device_remove_bin_file(&dev->primary->kdev,  &dpf_attrs_1);
594
	device_remove_bin_file(&dev->primary->kdev,  &dpf_attrs);
595
#ifdef CONFIG_PM
B
Ben Widawsky 已提交
596
	sysfs_unmerge_group(&dev->primary->kdev.kobj, &rc6_attr_group);
597
#endif
B
Ben Widawsky 已提交
598
}