From patchwork Mon Jan 11 11:01:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8002131 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E0DF0BEEE5 for ; Mon, 11 Jan 2016 11:03:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0F53920295 for ; Mon, 11 Jan 2016 11:03:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1E3D62028D for ; Mon, 11 Jan 2016 11:03:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 34C3D891EB; Mon, 11 Jan 2016 03:03:14 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B7F36E48A for ; Mon, 11 Jan 2016 03:02:33 -0800 (PST) Received: by mail-wm0-f67.google.com with SMTP id u188so25686027wmu.0 for ; Mon, 11 Jan 2016 03:02:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+pjexgAxc9DK/Nd0yQMndmfmfn5Q3X+LgfrXWAsnlIQ=; b=OoT1P6i72wlJikR66r8a/B1Z4biOPmFl+LyVMUkAzaY3TgCJ8hg2tHIIKLrE/suPEs E9M9K9nxi71PRFVcwHb1YjFCMyd+SV6UKN5i2vCtZl+OJE9lLgXfqTJnfSEBjnzdH/wg kIzkKGft5YyXxpiU9QUagl2an72c9JOBkwOjlIFcf84fxQaxU8bUPMyo27OgHgA6VBcL CMHiOCvT2ISmdDlGkkw/+VrHuBnGZQ1v76cca3+eo5yJ9aqzQyyXBKNZ4NtZU1xagv/t GhZvvAwUC7ccodmaeb34qyLKT7Mg63YPkZDVsaRpjbMwUoUdVn0dcktsoWYnlFDPoAqn w1PQ== X-Received: by 10.28.51.17 with SMTP id z17mr7974707wmz.26.1452510151976; Mon, 11 Jan 2016 03:02:31 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id 73sm12311579wmm.7.2016.01.11.03.02.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 03:02:31 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 11 Jan 2016 11:01:23 +0000 Message-Id: <1452510091-6833-41-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1452510091-6833-1-git-send-email-chris@chris-wilson.co.uk> References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk> <1452510091-6833-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 182/190] drm/i915: Avoid allocating a vmap arena for a single page X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 If we want a contiguous mapping of a single page sized object, we can forgo using vmap() and just use a regular kmap(). (This maybe worth lifting to the core, with the additional proviso that the pgprot_t is compatible.) Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_gem.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index cca45f60d0bd..7be5a8fb9180 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1882,14 +1882,17 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj) * lists early. */ list_del(&obj->global_list); - ops->put_pages(obj); - obj->pages = NULL; - if (obj->vmapping) { - vunmap(obj->vmapping); + if (obj->base.size == PAGE_SIZE) + kunmap(sg_page(obj->pages->sgl)); + else + vunmap(obj->vmapping); obj->vmapping = NULL; } + ops->put_pages(obj); + obj->pages = NULL; + i915_gem_object_invalidate(obj); return 0; @@ -2069,15 +2072,22 @@ void *i915_gem_object_pin_vmap(struct drm_i915_gem_object *obj) i915_gem_object_pin_pages(obj); if (obj->vmapping == NULL) { - struct sg_page_iter sg_iter; struct page **pages; - int n; - n = obj->base.size >> PAGE_SHIFT; - pages = drm_malloc_gfp(n, sizeof(*pages), GFP_TEMPORARY); + pages = NULL; + if (obj->base.size == PAGE_SIZE) + obj->vmapping = kmap(sg_page(obj->pages->sgl)); + else + pages = drm_malloc_gfp(obj->base.size >> PAGE_SHIFT, + sizeof(*pages), + GFP_TEMPORARY); if (pages != NULL) { + struct sg_page_iter sg_iter; + int n; + n = 0; - for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) + for_each_sg_page(obj->pages->sgl, &sg_iter, + obj->pages->nents, 0) pages[n++] = sg_page_iter_page(&sg_iter); obj->vmapping = vmap(pages, n, 0, PAGE_KERNEL);