aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-02-02 00:55:45 -0500
committerDave Airlie <airlied@redhat.com>2009-03-13 00:23:56 -0400
commitd883f7f1b75c8dcafa891f7b9e69c5a2f0ff6d66 (patch)
tree765a9bf6d3322ecfa42819622981baea2480ba41 /drivers/gpu/drm/i915/i915_dma.c
parent041b62374c7fedc11a8a1eeda2868612d3d1436c (diff)
drm: Use resource_size_t for drm_get_resource_{start, len}
The DRM uses its own wrappers to obtain resources from PCI devices, which currently convert the resource_size_t into an unsigned long. This is broken on 32-bit platforms with >32-bit physical address space. This fixes them, along with a few occurences of unsigned long used to store such a resource in drivers. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 6d21b9e48b89..4d9f5c6818ca 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1057,7 +1057,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
1057int i915_driver_load(struct drm_device *dev, unsigned long flags) 1057int i915_driver_load(struct drm_device *dev, unsigned long flags)
1058{ 1058{
1059 struct drm_i915_private *dev_priv = dev->dev_private; 1059 struct drm_i915_private *dev_priv = dev->dev_private;
1060 unsigned long base, size; 1060 resource_size_t base, size;
1061 int ret = 0, mmio_bar = IS_I9XX(dev) ? 0 : 1; 1061 int ret = 0, mmio_bar = IS_I9XX(dev) ? 0 : 1;
1062 1062
1063 /* i915 has 4 more counters */ 1063 /* i915 has 4 more counters */