From patchwork Tue Dec 17 22:42:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3366371 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 A05329F314 for ; Tue, 17 Dec 2013 22:41:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B49D2201CE for ; Tue, 17 Dec 2013 22:41:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 993AE201BE for ; Tue, 17 Dec 2013 22:41:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A39BFD405; Tue, 17 Dec 2013 14:41:23 -0800 (PST) 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 593C3FD405 for ; Tue, 17 Dec 2013 14:41:21 -0800 (PST) Received: by mail-ea0-f172.google.com with SMTP id q10so2722394ead.3 for ; Tue, 17 Dec 2013 14:41:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=/ac8ZFUGCNU+o624gBCgI7oQcNbxdClmmMMNbr/BxiM=; b=WPy3zq0Fb0jbMZBJgmp6NN4zczfgnojtCXPLKtuM5Oo3tfROchwCcmzZQDcPFAWeMH ka2ndhQiRLHzlnpxzXcoyiTZhHtElDnJMAVGVlK3PN+3FeS7UxJs3JV3a5XmxTpDM1J1 cjEqXJx6BAXY/6pJCW8DD8xrk2XyVMNvP09q4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/ac8ZFUGCNU+o624gBCgI7oQcNbxdClmmMMNbr/BxiM=; b=X21dcCjdRjacIGdQEy3fKZahujibWfpSq8RBBN5wic0sUS2FWt3tWqJyx5SZSItKHJ H8x2R4ebp6EpheNh0EzOImGnKi6zb1PT4w3rrSoVvIM5pCyvgP9h9aQ0mnnPM/qTOP1L X48THxKBRWAjHC2J8PcSi/9K+eoARmWYto4G5bv9tm/i6acy2sHhWmFUM/tki07J5iFY 1Hf/LY+Knq8EdBHFPx6zZ61JyYVO+Amjpt/1jZ3Zcsepv8zGDCOlmWgumEsoC4yjy+0Q 0TDaoLdaQQ/nlu88NNW0gYq4915YQ10Kl2R5Cxl3GxLOTPZJWYUX0dAFkrzxx4781k7V Izjg== X-Gm-Message-State: ALoCoQns8szrxSchAAAIX5HNN8V8vB1LWm+GOzg7rjuYM0rPcPlVjWIoGgB2AK9lhPWPYkuq2a3b X-Received: by 10.15.24.142 with SMTP id j14mr25794443eeu.52.1387320080103; Tue, 17 Dec 2013 14:41:20 -0800 (PST) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id v1sm57002423eef.9.2013.12.17.14.41.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Dec 2013 14:41:19 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 17 Dec 2013 23:42:11 +0100 Message-Id: <1387320131-16740-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.3 Cc: Daniel Vetter , Ben Widawsky Subject: [Intel-gfx] [PATCH] drm/i915: grab a pages pin count for preallocate stolen 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 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 But only when we indeed set up a gtt mapping. We need this since the vma also holds a pages_pin_count, on top of the unconditional pages_pin_count we grab for all stolen objects (to avoid swap-out). This should avoid a pages_pin_count underrun when cleaning up framebuffers objects taken over from the BIOS. Reported-by: Jesse Barnes Cc: Jesse Barnes Cc: Ben Widawsky Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/i915_gem_stolen.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index d284d892ed94..fed87ec17211 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -420,6 +420,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, list_add_tail(&obj->global_list, &dev_priv->mm.bound_list); list_add_tail(&vma->mm_list, &ggtt->inactive_list); + i915_gem_object_pin_pages(obj); return obj;