Commit aa596629 authored by Dave Airlie's avatar Dave Airlie
Browse files

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: default avatarDave Airlie <airlied@redhat.com>
parent aad87dff
...@@ -907,6 +907,12 @@ static int i915_load_modeset_init(struct drm_device *dev) ...@@ -907,6 +907,12 @@ static int i915_load_modeset_init(struct drm_device *dev)
int fb_bar = IS_I9XX(dev) ? 2 : 0; int fb_bar = IS_I9XX(dev) ? 2 : 0;
int ret = 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) & dev->mode_config.fb_base = drm_get_resource_start(dev, fb_bar) &
0xff000000; 0xff000000;
...@@ -917,7 +923,9 @@ static int i915_load_modeset_init(struct drm_device *dev) ...@@ -917,7 +923,9 @@ static int i915_load_modeset_init(struct drm_device *dev)
else else
dev_priv->cursor_needs_physical = false; 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) */ /* Basic memrange allocator for stolen space (aka vram) */
drm_mm_init(&dev_priv->vram, 0, prealloc_size); drm_mm_init(&dev_priv->vram, 0, prealloc_size);
...@@ -927,7 +935,7 @@ static int i915_load_modeset_init(struct drm_device *dev) ...@@ -927,7 +935,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
ret = i915_gem_init_ringbuffer(dev); ret = i915_gem_init_ringbuffer(dev);
if (ret) if (ret)
goto out; goto kfree_devname;
dev_priv->mm.gtt_mapping = dev_priv->mm.gtt_mapping =
io_mapping_create_wc(dev->agp->base, io_mapping_create_wc(dev->agp->base,
...@@ -966,18 +974,12 @@ static int i915_load_modeset_init(struct drm_device *dev) ...@@ -966,18 +974,12 @@ static int i915_load_modeset_init(struct drm_device *dev)
drm_helper_initial_config(dev, false); drm_helper_initial_config(dev, false);
dev->devname = kstrdup(DRIVER_NAME, GFP_KERNEL);
if (!dev->devname) {
ret = -ENOMEM;
goto modeset_cleanup;
}
return 0; return 0;
modeset_cleanup:
intel_modeset_cleanup(dev);
destroy_ringbuffer: destroy_ringbuffer:
i915_gem_cleanup_ringbuffer(dev); i915_gem_cleanup_ringbuffer(dev);
kfree_devname:
kfree(dev->devname);
out: out:
return ret; return ret;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment