From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang YanQing Subject: [PATCH 5/5] drm:drm_stub: rewrite error handle code for drm_fill_in_dev Date: Thu, 31 Oct 2013 07:12:31 +0800 Message-ID: <20131030231228.GC5719@udknight> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C528EF0D3 for ; Wed, 30 Oct 2013 16:12:55 -0700 (PDT) Received: by mail-pa0-f45.google.com with SMTP id kp14so1653854pab.32 for ; Wed, 30 Oct 2013 16:12:55 -0700 (PDT) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: airlied@linux.ie Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Rewrite error handle code in a more rational and normal way, it bring us benefit that we could drop call to drm_lastclose which do "too much" cleanup work for drm_fill_in_dev. Signed-off-by: Wang YanQing --- drivers/gpu/drm/drm_stub.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 3f3b167..6c5f65f 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -316,7 +316,7 @@ int drm_fill_in_dev(struct drm_device *dev, if (dev->driver->bus->agp_init) { retcode = dev->driver->bus->agp_init(dev); if (retcode) - goto error_out_unreg; + goto err_g1; } @@ -324,7 +324,7 @@ int drm_fill_in_dev(struct drm_device *dev, retcode = drm_ctxbitmap_init(dev); if (retcode) { DRM_ERROR("Cannot allocate memory for context bitmap.\n"); - goto error_out_unreg; + goto err_g2; } if (driver->driver_features & DRIVER_GEM) { @@ -332,14 +332,30 @@ int drm_fill_in_dev(struct drm_device *dev, if (retcode) { DRM_ERROR("Cannot initialize graphics execution " "manager (GEM)\n"); - goto error_out_unreg; + goto err_g3; } } return 0; - error_out_unreg: - drm_lastclose(dev); +err_g3: + drm_ctxbitmap_cleanup(dev); +err_g2: + if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) && + dev->agp && dev->agp->agp_mtrr >= 0) { + int retval; + retval = mtrr_del(dev->agp->agp_mtrr, + dev->agp->agp_info.aper_base, + dev->agp->agp_info.aper_size * 1024 * 1024); + DRM_DEBUG("mtrr_del=%d\n", retval); + } + + if (drm_core_has_AGP(dev) && dev->agp) { + kfree(dev->agp); + dev->agp = NULL; + } +err_g1: + drm_ht_remove(&dev->map_hash); return retcode; } EXPORT_SYMBOL(drm_fill_in_dev); -- 1.7.12.4.dirty