From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59CC0C433FF for ; Mon, 5 Aug 2019 12:46:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2CE3F20B1F for ; Mon, 5 Aug 2019 12:46:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728720AbfHEMp7 (ORCPT ); Mon, 5 Aug 2019 08:45:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41748 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726779AbfHEMp6 (ORCPT ); Mon, 5 Aug 2019 08:45:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7BF1081DEC; Mon, 5 Aug 2019 12:45:58 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-81.ams2.redhat.com [10.36.116.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A4B56012D; Mon, 5 Aug 2019 12:45:58 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 63FC29D00; Mon, 5 Aug 2019 14:45:57 +0200 (CEST) Date: Mon, 5 Aug 2019 14:45:57 +0200 From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, thomas@shipmail.org, tzimmermann@suse.de, ckoenig.leichtzumerken@gmail.com, bskeggs@redhat.com, daniel@ffwll.ch, Christian Koenig , Huang Rui , David Airlie , open list Subject: Re: [PATCH v5 11/18] [fixup] ttm Message-ID: <20190805124557.eazqln75mqm2ms63@sirius.home.kraxel.org> References: <20190805124310.3275-1-kraxel@redhat.com> <20190805124310.3275-12-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190805124310.3275-12-kraxel@redhat.com> User-Agent: NeoMutt/20180716 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 05 Aug 2019 12:45:58 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Aug 05, 2019 at 02:43:03PM +0200, Gerd Hoffmann wrote: > --- > drivers/gpu/drm/ttm/ttm_bo.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index b3d628b3f038..73d407494586 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -961,7 +961,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo, > struct ww_acquire_ctx *ticket; > int ret; > > - ticket = reservation_object_locking_ctx(bo->resv); > + ticket = reservation_object_locking_ctx(bo->base.resv); > do { > ret = (*man->func->get_node)(man, bo, place, mem); > if (unlikely(ret != 0)) Oops. This is meant to be squashed into 10/18 of course. cheers, Gerd