From patchwork Mon Jul 22 10:12:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2831205 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 41103C0319 for ; Mon, 22 Jul 2013 10:13:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1440220190 for ; Mon, 22 Jul 2013 10:13:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BA1572018A for ; Mon, 22 Jul 2013 10:13:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A76C9E6532 for ; Mon, 22 Jul 2013 03:13:05 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f172.google.com (mail-ea0-f172.google.com [209.85.215.172]) by gabe.freedesktop.org (Postfix) with ESMTP id A9261E5D0D for ; Mon, 22 Jul 2013 03:12:47 -0700 (PDT) Received: by mail-ea0-f172.google.com with SMTP id q10so3704299eaj.17 for ; Mon, 22 Jul 2013 03:12:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer; bh=xEdmQToQXEtkNUAkew8YgkXQGnmExbXfrT9j84NFwWI=; b=eihK9vTO2LjIPQRXQ6h04Ra5PpH00IVrbSEWV3zw8nPnv23zweHwdwJmymMlP6oGoe E7nhmpcLKqWVmKtJ/zkUYSTUy5XjxsIPAiOIaqHhuALvZRdeXkcWgKAoB5udxI1XHOhU Enm6KPqqJmQK8DsWs+T/wjAiP7PRjhZcoQzsw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=xEdmQToQXEtkNUAkew8YgkXQGnmExbXfrT9j84NFwWI=; b=Rz60ZbTB0l1gWtSTfX88nPIZawys7hKwkBE4zDsbXs0XDLodi74fsyUsg0KmjkRLnz pe3kLhuFLd0/LyyxT94mIJZ8XcLMMHL8oyRxwmLgA3xziACFtJRCDC76/yE3gAuA9Nck oe2OCT9C6aaI+UgvTORkqawgsvg3YHv//zv7CzZZ5tkqX/xh4tmwIidi8KV45qwGU0AC 8jO1X10rwMbmQySL/+XiWXJ0/D23XDLPZqmgFwomB5CL3wuWCuVa9L2JWkBmY8qFS2Iz 7QpF/v+iI3Xc80Imc765fYVpi0G5US1DIIIXTHHGjRqTaj22aO1c3X1/oAKt6Uwz8yhr X+bA== X-Received: by 10.15.99.2 with SMTP id bk2mr26984767eeb.76.1374487966712; Mon, 22 Jul 2013 03:12:46 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id e44sm49577851eeh.11.2013.07.22.03.12.45 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Jul 2013 03:12:45 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Mon, 22 Jul 2013 12:12:38 +0200 Message-Id: <1374487958-18999-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.2 X-Gm-Message-State: ALoCoQlLlzXMxyyLIhN3qzINV0ocymYZzlyJ5UkvZYsMb5QrtV+EOKgvzDd63LFOiLDWyq4tDY+z Cc: Daniel Vetter , Ben Widawsky Subject: [Intel-gfx] [PATCH] drm/i915: fix up error cleanup in i915_gem_object_bind_to_gtt X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This has been broken in commit 2f63315692b1d3c055972ad33fc7168ae908b97b Author: Ben Widawsky Date: Wed Jul 17 12:19:03 2013 -0700 drm/i915: Create VMAs which resulted in an OOPS the first time around we've hit -ENOSPC. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67156 Cc: Imre Deak Cc: Ben Widawsky Tested-by: meng Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson Reviewed-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index cfa6588..c87a6ec 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3121,8 +3121,8 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj, vma = i915_gem_vma_create(obj, &dev_priv->gtt.base); if (IS_ERR(vma)) { - i915_gem_object_unpin_pages(obj); - return PTR_ERR(vma); + ret = PTR_ERR(vma); + goto err_unpin; } search_free: @@ -3138,17 +3138,17 @@ search_free: if (ret == 0) goto search_free; - goto err_out; + goto err_free_vma; } if (WARN_ON(!i915_gem_valid_gtt_space(dev, &vma->node, obj->cache_level))) { ret = -EINVAL; - goto err_out; + goto err_remove_node; } ret = i915_gem_gtt_prepare_object(obj); if (ret) - goto err_out; + goto err_remove_node; list_move_tail(&obj->global_list, &dev_priv->mm.bound_list); list_add_tail(&obj->mm_list, &vm->inactive_list); @@ -3167,9 +3167,11 @@ search_free: i915_gem_verify_gtt(dev); return 0; -err_out: +err_remove_node: drm_mm_remove_node(&vma->node); +err_free_vma: i915_gem_vma_destroy(vma); +err_unpin: i915_gem_object_unpin_pages(obj); return ret; }