From patchwork Mon Dec 12 11:53:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9470657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8AF8960760 for ; Mon, 12 Dec 2016 11:58:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FFAF28472 for ; Mon, 12 Dec 2016 11:58:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73AA428478; Mon, 12 Dec 2016 11:58:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3BD7D28472 for ; Mon, 12 Dec 2016 11:58:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 210D96E315; Mon, 12 Dec 2016 11:58:09 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBBC06E2FB; Mon, 12 Dec 2016 11:54:30 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id m203so10709685wma.3; Mon, 12 Dec 2016 03:54:30 -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=3Em4b7QkFE4gOQPfllFR3x+xA7mRISgpdaL5TwmYfYo=; b=JCcBhKwgi72XMj2K3aI2++YbPSPC49Vnpp9O8YYuAQgL4FV7cPNJfuKYTsNsQ0dOVT VwI/UbRabV+aAwKgLt8Q9asOiM8HjvCyBKO3j56hfwqbWriH9/m9BIcJjVNRa4vErEPN cZROONMoDqCPRDIvggcp18xxA9Lg5IA7/Eg+wUnWcymkfkxiY7kL3ogGSDfTm5LPY8zx oeM0coZrKRR597zSBjGpuuTW9qa4O4qpimnFsmqVLgJLX7hJoxuaoJfd7HiVyU8PplHJ fcSZThANm04L/WkMnQX0dvezxqbLhZPSj8MpgNpKNljpXzvC5pqBf0APavpYXuAuyusI yNXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=3Em4b7QkFE4gOQPfllFR3x+xA7mRISgpdaL5TwmYfYo=; b=AaMj7mfmSjR0gBPPSdTUgBqP8usq2nrTHWU2PdcPGKjxZhH9pb4eNBOfvTARYKIi++ S6nKD3NZueOzYMa1mWY4vRLXEKJ4dyj17Cab9kTIxiQGhL7Bzxs5znUMhXADnUvojKV1 jVPMQALZNF3HJTm0m7z5yueICI2li6V+BEC0I8qW17osUC7CPmBxEfOAp2wHC4KpNCU+ 5+Vgu2RND7F21upI7eil9fEqTkrZ1AhighjPnaqrUOcHTSLv00CQn/eC8ofl+KReUUDk +AIIzawo9pE4maFmbF3Ay+wmizoCLCeVobu7ovR/1141HFkvJJXaI+izIXGibMIvmTYR o8Jw== X-Gm-Message-State: AKaTC03SCNSLWjs+4yhq/f+uieAnb2/xeloq2sRKVSFr34/P1aoRHFDFIdKgIrJKajp4bA== X-Received: by 10.28.209.7 with SMTP id i7mr9638975wmg.62.1481543668611; Mon, 12 Dec 2016 03:54:28 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id u81sm35077381wmu.10.2016.12.12.03.54.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Dec 2016 03:54:28 -0800 (PST) From: Chris Wilson To: dri-devel@lists.freedesktop.org Date: Mon, 12 Dec 2016 11:53:46 +0000 Message-Id: <20161212115350.780-31-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161212115350.780-1-chris@chris-wilson.co.uk> References: <20161212115350.780-1-chris@chris-wilson.co.uk> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 30/34] drm: Optimise power-of-two alignments in drm_mm_scan_add_block() 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-Virus-Scanned: ClamAV using ClamSMTP For power-of-two alignments, we can avoid the 64bit divide and do a simple bitwise add instead. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/drm_mm.c | 9 ++++++++- include/drm/drm_mm.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index eec0a46f5b38..7245483f1111 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c @@ -741,8 +741,12 @@ void drm_mm_scan_init_with_range(struct drm_mm_scan *scan, scan->mm = mm; + if (alignment <= 1) + alignment = 0; + scan->color = color; scan->alignment = alignment; + scan->alignment_mask = is_power_of_2(alignment) ? alignment - 1 : 0; scan->size = size; scan->flags = flags; @@ -810,7 +814,10 @@ bool drm_mm_scan_add_block(struct drm_mm_scan *scan, if (scan->alignment) { u64 rem; - div64_u64_rem(adj_start, scan->alignment, &rem); + if (scan->alignment_mask) + rem = adj_start & scan->alignment_mask; + else + div64_u64_rem(adj_start, scan->alignment, &rem); if (rem) { adj_start -= rem; if (scan->flags != DRM_MM_CREATE_TOP) diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h index 5e8350b91fcf..90d607e31301 100644 --- a/include/drm/drm_mm.h +++ b/include/drm/drm_mm.h @@ -109,6 +109,7 @@ struct drm_mm_scan { u64 size; u64 alignment; + u64 alignment_mask; u64 range_start; u64 range_end;