summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-12-29 16:35:02 +1000
committerDave Airlie <airlied@linux.ie>2008-12-29 18:18:19 +1000
commitaa5966296675a5092505f68d72563d5939a92353 (patch)
tree9653e7a7674a2cf668fe0e33ba789a6a45f84ca5 /drivers/gpu/drm
parentaad87dff5acb232666932e750318ec1fdb716e79 (diff)
downloadlinux-next-aa5966296675a5092505f68d72563d5939a92353.tar.gz
drm/i915: fix modeset devname allocation + agp init return check.
devname needs to be allocated before the irq is installed, so the irq routines get the correct name in /proc. Also check the return value from the AGP init function, and fixup the exit points. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 65482cabc94a..3d7082af5b72 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -907,6 +907,12 @@ static int i915_load_modeset_init(struct drm_device *dev)
int fb_bar = IS_I9XX(dev) ? 2 : 0;
int ret = 0;
+ dev->devname = kstrdup(DRIVER_NAME, GFP_KERNEL);
+ if (!dev->devname) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
dev->mode_config.fb_base = drm_get_resource_start(dev, fb_bar) &
0xff000000;
@@ -917,7 +923,9 @@ static int i915_load_modeset_init(struct drm_device *dev)
else
dev_priv->cursor_needs_physical = false;
- i915_probe_agp(dev, &agp_size, &prealloc_size);
+ ret = i915_probe_agp(dev, &agp_size, &prealloc_size);
+ if (ret)
+ goto kfree_devname;
/* Basic memrange allocator for stolen space (aka vram) */
drm_mm_init(&dev_priv->vram, 0, prealloc_size);
@@ -927,7 +935,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
ret = i915_gem_init_ringbuffer(dev);
if (ret)
- goto out;
+ goto kfree_devname;
dev_priv->mm.gtt_mapping =
io_mapping_create_wc(dev->agp->base,
@@ -966,18 +974,12 @@ static int i915_load_modeset_init(struct drm_device *dev)
drm_helper_initial_config(dev, false);
- dev->devname = kstrdup(DRIVER_NAME, GFP_KERNEL);
- if (!dev->devname) {
- ret = -ENOMEM;
- goto modeset_cleanup;
- }
-
return 0;
-modeset_cleanup:
- intel_modeset_cleanup(dev);
destroy_ringbuffer:
i915_gem_cleanup_ringbuffer(dev);
+kfree_devname:
+ kfree(dev->devname);
out:
return ret;
}