diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2014-03-31 07:27:14 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-31 09:32:24 -0400 |
| commit | e277a1f8694c5faf256bc136b09a6adf804af19c (patch) | |
| tree | d35227197c7b3bb35dbda86406d51de2f56aebc1 /drivers/gpu | |
| parent | 2876ce734417b1893d48e86c9ade9100e1fcc297 (diff) | |
drm/i915/debugfs: prefer struct drm_i915_private to drm_i915_private_t
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 049dcb5256d1..7522f978677e 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
| @@ -561,7 +561,7 @@ static int i915_gem_request_info(struct seq_file *m, void *data) | |||
| 561 | { | 561 | { |
| 562 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 562 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 563 | struct drm_device *dev = node->minor->dev; | 563 | struct drm_device *dev = node->minor->dev; |
| 564 | drm_i915_private_t *dev_priv = dev->dev_private; | 564 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 565 | struct intel_ring_buffer *ring; | 565 | struct intel_ring_buffer *ring; |
| 566 | struct drm_i915_gem_request *gem_request; | 566 | struct drm_i915_gem_request *gem_request; |
| 567 | int ret, count, i; | 567 | int ret, count, i; |
| @@ -606,7 +606,7 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data) | |||
| 606 | { | 606 | { |
| 607 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 607 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 608 | struct drm_device *dev = node->minor->dev; | 608 | struct drm_device *dev = node->minor->dev; |
| 609 | drm_i915_private_t *dev_priv = dev->dev_private; | 609 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 610 | struct intel_ring_buffer *ring; | 610 | struct intel_ring_buffer *ring; |
| 611 | int ret, i; | 611 | int ret, i; |
| 612 | 612 | ||
| @@ -629,7 +629,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) | |||
| 629 | { | 629 | { |
| 630 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 630 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 631 | struct drm_device *dev = node->minor->dev; | 631 | struct drm_device *dev = node->minor->dev; |
| 632 | drm_i915_private_t *dev_priv = dev->dev_private; | 632 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 633 | struct intel_ring_buffer *ring; | 633 | struct intel_ring_buffer *ring; |
| 634 | int ret, i, pipe; | 634 | int ret, i, pipe; |
| 635 | 635 | ||
| @@ -770,7 +770,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data) | |||
| 770 | { | 770 | { |
| 771 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 771 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 772 | struct drm_device *dev = node->minor->dev; | 772 | struct drm_device *dev = node->minor->dev; |
| 773 | drm_i915_private_t *dev_priv = dev->dev_private; | 773 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 774 | int i, ret; | 774 | int i, ret; |
| 775 | 775 | ||
| 776 | ret = mutex_lock_interruptible(&dev->struct_mutex); | 776 | ret = mutex_lock_interruptible(&dev->struct_mutex); |
| @@ -799,7 +799,7 @@ static int i915_hws_info(struct seq_file *m, void *data) | |||
| 799 | { | 799 | { |
| 800 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 800 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 801 | struct drm_device *dev = node->minor->dev; | 801 | struct drm_device *dev = node->minor->dev; |
| 802 | drm_i915_private_t *dev_priv = dev->dev_private; | 802 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 803 | struct intel_ring_buffer *ring; | 803 | struct intel_ring_buffer *ring; |
| 804 | const u32 *hws; | 804 | const u32 *hws; |
| 805 | int i; | 805 | int i; |
| @@ -910,7 +910,7 @@ static int | |||
| 910 | i915_next_seqno_get(void *data, u64 *val) | 910 | i915_next_seqno_get(void *data, u64 *val) |
| 911 | { | 911 | { |
| 912 | struct drm_device *dev = data; | 912 | struct drm_device *dev = data; |
| 913 | drm_i915_private_t *dev_priv = dev->dev_private; | 913 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 914 | int ret; | 914 | int ret; |
| 915 | 915 | ||
| 916 | ret = mutex_lock_interruptible(&dev->struct_mutex); | 916 | ret = mutex_lock_interruptible(&dev->struct_mutex); |
| @@ -947,7 +947,7 @@ static int i915_rstdby_delays(struct seq_file *m, void *unused) | |||
| 947 | { | 947 | { |
| 948 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 948 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 949 | struct drm_device *dev = node->minor->dev; | 949 | struct drm_device *dev = node->minor->dev; |
| 950 | drm_i915_private_t *dev_priv = dev->dev_private; | 950 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 951 | u16 crstanddelay; | 951 | u16 crstanddelay; |
| 952 | int ret; | 952 | int ret; |
| 953 | 953 | ||
| @@ -970,7 +970,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused) | |||
| 970 | { | 970 | { |
| 971 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 971 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 972 | struct drm_device *dev = node->minor->dev; | 972 | struct drm_device *dev = node->minor->dev; |
| 973 | drm_i915_private_t *dev_priv = dev->dev_private; | 973 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 974 | int ret = 0; | 974 | int ret = 0; |
| 975 | 975 | ||
| 976 | intel_runtime_pm_get(dev_priv); | 976 | intel_runtime_pm_get(dev_priv); |
| @@ -1096,7 +1096,7 @@ static int i915_delayfreq_table(struct seq_file *m, void *unused) | |||
| 1096 | { | 1096 | { |
| 1097 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1097 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1098 | struct drm_device *dev = node->minor->dev; | 1098 | struct drm_device *dev = node->minor->dev; |
| 1099 | drm_i915_private_t *dev_priv = dev->dev_private; | 1099 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1100 | u32 delayfreq; | 1100 | u32 delayfreq; |
| 1101 | int ret, i; | 1101 | int ret, i; |
| 1102 | 1102 | ||
| @@ -1127,7 +1127,7 @@ static int i915_inttoext_table(struct seq_file *m, void *unused) | |||
| 1127 | { | 1127 | { |
| 1128 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1128 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1129 | struct drm_device *dev = node->minor->dev; | 1129 | struct drm_device *dev = node->minor->dev; |
| 1130 | drm_i915_private_t *dev_priv = dev->dev_private; | 1130 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1131 | u32 inttoext; | 1131 | u32 inttoext; |
| 1132 | int ret, i; | 1132 | int ret, i; |
| 1133 | 1133 | ||
| @@ -1151,7 +1151,7 @@ static int ironlake_drpc_info(struct seq_file *m) | |||
| 1151 | { | 1151 | { |
| 1152 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1152 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1153 | struct drm_device *dev = node->minor->dev; | 1153 | struct drm_device *dev = node->minor->dev; |
| 1154 | drm_i915_private_t *dev_priv = dev->dev_private; | 1154 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1155 | u32 rgvmodectl, rstdbyctl; | 1155 | u32 rgvmodectl, rstdbyctl; |
| 1156 | u16 crstandvid; | 1156 | u16 crstandvid; |
| 1157 | int ret; | 1157 | int ret; |
| @@ -1377,7 +1377,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused) | |||
| 1377 | { | 1377 | { |
| 1378 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1378 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1379 | struct drm_device *dev = node->minor->dev; | 1379 | struct drm_device *dev = node->minor->dev; |
| 1380 | drm_i915_private_t *dev_priv = dev->dev_private; | 1380 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1381 | 1381 | ||
| 1382 | if (!HAS_FBC(dev)) { | 1382 | if (!HAS_FBC(dev)) { |
| 1383 | seq_puts(m, "FBC unsupported on this chipset\n"); | 1383 | seq_puts(m, "FBC unsupported on this chipset\n"); |
| @@ -1462,7 +1462,7 @@ static int i915_sr_status(struct seq_file *m, void *unused) | |||
| 1462 | { | 1462 | { |
| 1463 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1463 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1464 | struct drm_device *dev = node->minor->dev; | 1464 | struct drm_device *dev = node->minor->dev; |
| 1465 | drm_i915_private_t *dev_priv = dev->dev_private; | 1465 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1466 | bool sr_enabled = false; | 1466 | bool sr_enabled = false; |
| 1467 | 1467 | ||
| 1468 | intel_runtime_pm_get(dev_priv); | 1468 | intel_runtime_pm_get(dev_priv); |
| @@ -1488,7 +1488,7 @@ static int i915_emon_status(struct seq_file *m, void *unused) | |||
| 1488 | { | 1488 | { |
| 1489 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1489 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1490 | struct drm_device *dev = node->minor->dev; | 1490 | struct drm_device *dev = node->minor->dev; |
| 1491 | drm_i915_private_t *dev_priv = dev->dev_private; | 1491 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1492 | unsigned long temp, chipset, gfx; | 1492 | unsigned long temp, chipset, gfx; |
| 1493 | int ret; | 1493 | int ret; |
| 1494 | 1494 | ||
| @@ -1516,7 +1516,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) | |||
| 1516 | { | 1516 | { |
| 1517 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1517 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1518 | struct drm_device *dev = node->minor->dev; | 1518 | struct drm_device *dev = node->minor->dev; |
| 1519 | drm_i915_private_t *dev_priv = dev->dev_private; | 1519 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1520 | int ret = 0; | 1520 | int ret = 0; |
| 1521 | int gpu_freq, ia_freq; | 1521 | int gpu_freq, ia_freq; |
| 1522 | 1522 | ||
| @@ -1559,7 +1559,7 @@ static int i915_gfxec(struct seq_file *m, void *unused) | |||
| 1559 | { | 1559 | { |
| 1560 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1560 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1561 | struct drm_device *dev = node->minor->dev; | 1561 | struct drm_device *dev = node->minor->dev; |
| 1562 | drm_i915_private_t *dev_priv = dev->dev_private; | 1562 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1563 | int ret; | 1563 | int ret; |
| 1564 | 1564 | ||
| 1565 | ret = mutex_lock_interruptible(&dev->struct_mutex); | 1565 | ret = mutex_lock_interruptible(&dev->struct_mutex); |
| @@ -1579,7 +1579,7 @@ static int i915_opregion(struct seq_file *m, void *unused) | |||
| 1579 | { | 1579 | { |
| 1580 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1580 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1581 | struct drm_device *dev = node->minor->dev; | 1581 | struct drm_device *dev = node->minor->dev; |
| 1582 | drm_i915_private_t *dev_priv = dev->dev_private; | 1582 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1583 | struct intel_opregion *opregion = &dev_priv->opregion; | 1583 | struct intel_opregion *opregion = &dev_priv->opregion; |
| 1584 | void *data = kmalloc(OPREGION_SIZE, GFP_KERNEL); | 1584 | void *data = kmalloc(OPREGION_SIZE, GFP_KERNEL); |
| 1585 | int ret; | 1585 | int ret; |
| @@ -1653,7 +1653,7 @@ static int i915_context_status(struct seq_file *m, void *unused) | |||
| 1653 | { | 1653 | { |
| 1654 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1654 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1655 | struct drm_device *dev = node->minor->dev; | 1655 | struct drm_device *dev = node->minor->dev; |
| 1656 | drm_i915_private_t *dev_priv = dev->dev_private; | 1656 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1657 | struct intel_ring_buffer *ring; | 1657 | struct intel_ring_buffer *ring; |
| 1658 | struct i915_hw_context *ctx; | 1658 | struct i915_hw_context *ctx; |
| 1659 | int ret, i; | 1659 | int ret, i; |
| @@ -3271,7 +3271,7 @@ static int | |||
| 3271 | i915_wedged_get(void *data, u64 *val) | 3271 | i915_wedged_get(void *data, u64 *val) |
| 3272 | { | 3272 | { |
| 3273 | struct drm_device *dev = data; | 3273 | struct drm_device *dev = data; |
| 3274 | drm_i915_private_t *dev_priv = dev->dev_private; | 3274 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 3275 | 3275 | ||
| 3276 | *val = atomic_read(&dev_priv->gpu_error.reset_counter); | 3276 | *val = atomic_read(&dev_priv->gpu_error.reset_counter); |
| 3277 | 3277 | ||
| @@ -3296,7 +3296,7 @@ static int | |||
| 3296 | i915_ring_stop_get(void *data, u64 *val) | 3296 | i915_ring_stop_get(void *data, u64 *val) |
| 3297 | { | 3297 | { |
| 3298 | struct drm_device *dev = data; | 3298 | struct drm_device *dev = data; |
| 3299 | drm_i915_private_t *dev_priv = dev->dev_private; | 3299 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 3300 | 3300 | ||
| 3301 | *val = dev_priv->gpu_error.stop_rings; | 3301 | *val = dev_priv->gpu_error.stop_rings; |
| 3302 | 3302 | ||
| @@ -3473,7 +3473,7 @@ static int | |||
| 3473 | i915_max_freq_get(void *data, u64 *val) | 3473 | i915_max_freq_get(void *data, u64 *val) |
| 3474 | { | 3474 | { |
| 3475 | struct drm_device *dev = data; | 3475 | struct drm_device *dev = data; |
| 3476 | drm_i915_private_t *dev_priv = dev->dev_private; | 3476 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 3477 | int ret; | 3477 | int ret; |
| 3478 | 3478 | ||
| 3479 | if (!(IS_GEN6(dev) || IS_GEN7(dev))) | 3479 | if (!(IS_GEN6(dev) || IS_GEN7(dev))) |
| @@ -3554,7 +3554,7 @@ static int | |||
| 3554 | i915_min_freq_get(void *data, u64 *val) | 3554 | i915_min_freq_get(void *data, u64 *val) |
| 3555 | { | 3555 | { |
| 3556 | struct drm_device *dev = data; | 3556 | struct drm_device *dev = data; |
| 3557 | drm_i915_private_t *dev_priv = dev->dev_private; | 3557 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 3558 | int ret; | 3558 | int ret; |
| 3559 | 3559 | ||
| 3560 | if (!(IS_GEN6(dev) || IS_GEN7(dev))) | 3560 | if (!(IS_GEN6(dev) || IS_GEN7(dev))) |
| @@ -3635,7 +3635,7 @@ static int | |||
| 3635 | i915_cache_sharing_get(void *data, u64 *val) | 3635 | i915_cache_sharing_get(void *data, u64 *val) |
| 3636 | { | 3636 | { |
| 3637 | struct drm_device *dev = data; | 3637 | struct drm_device *dev = data; |
| 3638 | drm_i915_private_t *dev_priv = dev->dev_private; | 3638 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 3639 | u32 snpcr; | 3639 | u32 snpcr; |
| 3640 | int ret; | 3640 | int ret; |
| 3641 | 3641 | ||
