From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/mm: Adjust start/end for coloring first Date: Mon, 19 May 2014 10:14:27 +0200 Message-ID: <20140519081427.GF8790@phenom.ffwll.local> References: <1400482357-24988-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f50.google.com (mail-ee0-f50.google.com [74.125.83.50]) by gabe.freedesktop.org (Postfix) with ESMTP id 747DD6E2BF for ; Mon, 19 May 2014 01:14:31 -0700 (PDT) Received: by mail-ee0-f50.google.com with SMTP id e51so3283586eek.37 for ; Mon, 19 May 2014 01:14:30 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1400482357-24988-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Chris Wilson Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Mon, May 19, 2014 at 07:52:37AM +0100, Chris Wilson wrote: > The current user of the coloring will adjust the end points of the node > to leave a hole between disjoint memory types. This adjustment must be > performed first or else the derived size will conflict with the > adjustment and trigger the BUG_ON sanity checks that the node is within > bounds. > > Fixes regression from > commit 62347f9e0f81d50e9b0923ec8a192f60ab7a1801 > Author: Lauri Kasanen > Date: Wed Apr 2 20:03:57 2014 +0300 > > drm: Add support for two-ended allocation, v3 > > Signed-off-by: Chris Wilson Do we have a bugzilla for this, or why did igt not scream about this failure? -Daniel > --- > drivers/gpu/drm/drm_mm.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c > index 04a209e2b66d..911863bed9f3 100644 > --- a/drivers/gpu/drm/drm_mm.c > +++ b/drivers/gpu/drm/drm_mm.c > @@ -264,12 +264,12 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, > if (adj_end > end) > adj_end = end; > > - if (flags & DRM_MM_CREATE_TOP) > - adj_start = adj_end - size; > - > if (mm->color_adjust) > mm->color_adjust(hole_node, color, &adj_start, &adj_end); > > + if (flags & DRM_MM_CREATE_TOP) > + adj_start = adj_end - size; > + > if (alignment) { > unsigned tmp = adj_start % alignment; > if (tmp) { > -- > 2.0.0.rc2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch