From patchwork Mon Jul 1 20:01:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2809371 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6441F9F3EB for ; Mon, 1 Jul 2013 20:07:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 48327201AF for ; Mon, 1 Jul 2013 20:07:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2FF34201AA for ; Mon, 1 Jul 2013 20:07:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 19B74E60AE for ; Mon, 1 Jul 2013 13:07:06 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com [74.125.83.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 537E7E5C3D for ; Mon, 1 Jul 2013 13:04:16 -0700 (PDT) Received: by mail-ee0-f42.google.com with SMTP id c4so2258882eek.15 for ; Mon, 01 Jul 2013 13:04:15 -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:in-reply-to:references; bh=rtroZ4l8yxZLFKuW0834NstKwRvp1dGraOJt1xtfObQ=; b=MT6AQFO0d5fyNUXPUDCBVvNm3h1Bt4H9EhAQnOBeC2WWRKxMBcCC61dVIxkMkjDXrq 2sxsfoBmN+qvDRt7CrRaFkBUPNxIP8wJsm84oXIjuMAewg4B8ZZMpKi+dqBeqd5I1XNx b48hHvTN8SWIqo3w8ifQKIJC9bT9hWjGh8Lag= 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:in-reply-to:references :x-gm-message-state; bh=rtroZ4l8yxZLFKuW0834NstKwRvp1dGraOJt1xtfObQ=; b=ba+iNUFNw8MufKRv/cBeseIkQVKkMX2tR5uPPZMQb2M7BquWzg7wcWMbZZW3yzWcWj woXmbYEeV9q+rT63MEqHbmEY/3Rp7xATpylCGaDNY9enPyq8h/GMsnm09owt3MAfnpVo H4/bCFFFnX1Uv6Tm1LjmaEmsXQTSqhS/Ps+Uj1Zd/XivZqKrd5RE9LDnD11O0xAnH/Eh 6tO3rEGwVwIKeju+xRqLRLFqiBazCgUKaUCywM6Rhq5Zr8q5nW5WR393MraM/JZGOhNL An5hMQj1kuWcfswmaWGL+WRROGF9EKXdqRaZ4F0rZUiGWJR46ehFoNSPgQT8U/Jg2R4n aWyw== X-Received: by 10.14.148.133 with SMTP id v5mr22926709eej.81.1372709055498; Mon, 01 Jul 2013 13:04:15 -0700 (PDT) Received: from gina.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id ci50sm31853473eeb.12.2013.07.01.13.04.13 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Jul 2013 13:04:14 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Mon, 1 Jul 2013 22:01:03 +0200 Message-Id: <1372708864-26963-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1372708864-26963-1-git-send-email-daniel.vetter@ffwll.ch> References: <1372708864-26963-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmeVbRXgvPC8jGtVoQ/a6BKkIrYr4xd3FMvA8CgAVkxEckmFjgHsaN4i30As3GFSbvfn8qH Cc: Daniel Vetter , DRI Development , David Herrmann Subject: [Intel-gfx] [PATCH 2/3] drm/i915: Don't try to tear down the stolen drm_mm if it's not there 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=-4.1 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 Every other place properly checks whether we've managed to set up the stolen allocator at boot-up properly, with the exception of the cleanup code. Which results in an ugly *ERROR* Memory manager not clean. Delaying takedown at module unload time since the drm_mm isn't initialized at all. v2: While at it check whether the stolen drm_mm is initialized instead of the more obscure stolen_base == 0 check. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65953 Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_gem_stolen.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 8e02344..32e63a8 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -147,7 +147,7 @@ int i915_gem_stolen_setup_compression(struct drm_device *dev, int size) { struct drm_i915_private *dev_priv = dev->dev_private; - if (dev_priv->mm.stolen_base == 0) + if (drm_mm_initialized(&dev_priv->mm.stolen)) return -ENODEV; if (size < dev_priv->fbc.size) @@ -179,6 +179,9 @@ void i915_gem_cleanup_stolen(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; + if (drm_mm_initialized(&dev_priv->mm.stolen)) + return; + i915_gem_stolen_cleanup_compression(dev); drm_mm_takedown(&dev_priv->mm.stolen); } @@ -300,7 +303,7 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size) struct drm_i915_gem_object *obj; struct drm_mm_node *stolen; - if (dev_priv->mm.stolen_base == 0) + if (drm_mm_initialized(&dev_priv->mm.stolen)) return NULL; DRM_DEBUG_KMS("creating stolen object: size=%x\n", size); @@ -331,7 +334,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, struct drm_i915_gem_object *obj; struct drm_mm_node *stolen; - if (dev_priv->mm.stolen_base == 0) + if (drm_mm_initialized(&dev_priv->mm.stolen)) return NULL; DRM_DEBUG_KMS("creating preallocated stolen object: stolen_offset=%x, gtt_offset=%x, size=%x\n",