From patchwork Fri May 29 14:04:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nirmoy Das X-Patchwork-Id: 11580195 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 72BED913 for ; Sat, 30 May 2020 09:42:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4492A20B80 for ; Sat, 30 May 2020 09:42:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GvVSrVsv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4492A20B80 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C4FB6E9C8; Sat, 30 May 2020 09:42:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4FF3C6E90C for ; Fri, 29 May 2020 14:03:40 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id s8so3693660wrt.9 for ; Fri, 29 May 2020 07:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RwXGTrTSkhfIwmTsFAlwLp31G8dXS8cicMkf9zgOj/A=; b=GvVSrVsvM86uEOHuD6a/Cgoc0Fr2OaKCfja3DhluouGDDWpSsF4CjGxXuRUh1EqQLj bLCvMXlIYeO714pksvToQBttxtopmn2mgRIk14KMvZmSQOzQ6ciIjkja4RBIcHEBxaDo pTfGBEj0aJ1U19aZI8TYHPm4EbfdQmFi8NOMJR3cQCwUsj7At3qVHeCh0GBvHq83jLdF 1CEXEpSfIZEmu4buwrTgwFCSiQb7GQ+d9v8POSp9551eJJNXJcco8tL/TDk9MPtpA5aY 7IW/V3YVCwIWGfLt4k6Jb3LpeLng3ZZF0L3Hat2ax2NEIwWivJ0uwYQTbnPvg1QJR9kC EHLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RwXGTrTSkhfIwmTsFAlwLp31G8dXS8cicMkf9zgOj/A=; b=LPA3/Lj1mrh69HNjlD/VVVGbU6scaa4YTb3jLdtOYKZii8sYT7FZV5abIDk2fp/bc3 l2YxMglWf/A6boI9ExVDMkh1GSs8jUwSOiX1FU5KoxVTQ3MQK6hDql3yyT3xYVk08Yr8 Noe9Dt4NXF8JCVh+Tc2jcf+giYBsgpW92UMf2/nBPYhR+zNiwYIxb92nYcoB6Ru2SKWy XdfPtcroTbq8YR7SoOlppCGGEZLwK9C6lmhGsADizpus5zk5suiF6Np5JwlqDTjwt9wf kuP2r1le4jF0K+8sbkj+KbwHvEttZS9tZ8HGuM3u32NWFT0gMS2aQJHgFwx9RWNm2zUT qJYA== X-Gm-Message-State: AOAM530dlSrw6aGdkLbXt0kXrnzXeTHMQsfpTGxT2jt34RO6YIrCB2bl BF1/ut0JZCC+lIMpIveZvBKDmmzsEpI= X-Google-Smtp-Source: ABdhPJxy5LbmVodZhUe6FwuHEakfNuJvHsmJ0XcDapuhsLv3T7SqQf1VEPd5pFN8RIfgUOIh3S29lg== X-Received: by 2002:adf:9b9e:: with SMTP id d30mr9071909wrc.345.1590761015673; Fri, 29 May 2020 07:03:35 -0700 (PDT) Received: from localhost.localdomain (p200300c58f1f0600dbea65ed0a386805.dip0.t-ipconnect.de. [2003:c5:8f1f:600:dbea:65ed:a38:6805]) by smtp.gmail.com with ESMTPSA id q13sm4900300wro.5.2020.05.29.07.03.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 07:03:34 -0700 (PDT) From: Nirmoy Das X-Google-Original-From: Nirmoy Das To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/1] drm/mm: fix hole size comparison Date: Fri, 29 May 2020 16:04:01 +0200 Message-Id: <20200529140401.39396-1-nirmoy.das@amd.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Mailman-Approved-At: Sat, 30 May 2020 09:42:14 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nirmoy Das , christian.koenig@amd.com, chris@chris-wilson.co.uk Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes: 0cdea4455acd350a ("drm/mm: optimize rb_hole_addr rbtree search") Signed-off-by: Nirmoy Das Reported-by: Christian König --- drivers/gpu/drm/drm_mm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index f4ca1ff80af9..60e9a9c91e9d 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c @@ -407,7 +407,7 @@ next_hole_high_addr(struct drm_mm_node *entry, u64 size) left_node = rb_entry(left_rb_node, struct drm_mm_node, rb_hole_addr); if ((left_node->subtree_max_hole < size || - entry->size == entry->subtree_max_hole) && + HOLE_SIZE(entry) == entry->subtree_max_hole) && parent_rb_node && parent_rb_node->rb_left != rb_node) return rb_hole_addr_to_node(parent_rb_node); } @@ -447,7 +447,7 @@ next_hole_low_addr(struct drm_mm_node *entry, u64 size) right_node = rb_entry(right_rb_node, struct drm_mm_node, rb_hole_addr); if ((right_node->subtree_max_hole < size || - entry->size == entry->subtree_max_hole) && + HOLE_SIZE(entry) == entry->subtree_max_hole) && parent_rb_node && parent_rb_node->rb_right != rb_node) return rb_hole_addr_to_node(parent_rb_node); }