diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-29 16:18:51 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-03 16:31:04 -0500 |
commit | 1a240d4de2ccf40de5796a4d1dbb3a0236051fc9 (patch) | |
tree | b9bb2cb0b3e1158f01b35a2c3aea9c2bcf060f27 /drivers/gpu/drm/i915/i915_debugfs.c | |
parent | c1f093e09c4ceb583b04d11e767bb3201812e4d2 (diff) |
drm/i915: fixup sparse warnings
- __iomem where there is none (I love how we mix these things up).
- Use gfp_t instead of an other plain type.
- Unconfuse one place about enum pipe vs enum transcoder - for the pch
transcoder we actually use the pipe enum. Fixup the other cases
where we assign the pipe to the cpu transcoder with explicit casts.
- Declare the mch_lock properly in a header.
There is still a decent mess in intel_bios.c about __iomem, but heck,
this is x86 and we're allowed to do that.
Makes-sparse-happy: Chris Wilson <chris@chris-wilson.co.uk>
[danvet: Use a space after the cast consistently and fix up the
newly-added cast in i915_irq.c to properly use __iomem.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 58e667687741..ce60506b574b 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -546,11 +546,11 @@ static int i915_hws_info(struct seq_file *m, void *data) | |||
546 | struct drm_device *dev = node->minor->dev; | 546 | struct drm_device *dev = node->minor->dev; |
547 | drm_i915_private_t *dev_priv = dev->dev_private; | 547 | drm_i915_private_t *dev_priv = dev->dev_private; |
548 | struct intel_ring_buffer *ring; | 548 | struct intel_ring_buffer *ring; |
549 | const volatile u32 __iomem *hws; | 549 | const u32 *hws; |
550 | int i; | 550 | int i; |
551 | 551 | ||
552 | ring = &dev_priv->ring[(uintptr_t)node->info_ent->data]; | 552 | ring = &dev_priv->ring[(uintptr_t)node->info_ent->data]; |
553 | hws = (volatile u32 __iomem *)ring->status_page.page_addr; | 553 | hws = ring->status_page.page_addr; |
554 | if (hws == NULL) | 554 | if (hws == NULL) |
555 | return 0; | 555 | return 0; |
556 | 556 | ||