From 682e7d1a71264b656c52ec91a54fb15429c4ed44 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 29 Dec 2008 16:35:02 +1000 Subject: [PATCH] --- yaml --- r: 123453 b: refs/heads/master c: aa5966296675a5092505f68d72563d5939a92353 h: refs/heads/master i: 123451: c257eae38180c96caec85751a7852ea41804206d v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index efa4af6f8be9..53c632f900c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aad87dff5acb232666932e750318ec1fdb716e79 +refs/heads/master: aa5966296675a5092505f68d72563d5939a92353 diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c index 65482cabc94a..3d7082af5b72 100644 --- a/trunk/drivers/gpu/drm/i915/i915_dma.c +++ b/trunk/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; }