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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D745FC433EF for ; Fri, 8 Apr 2022 08:32:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CF93910F0E6; Fri, 8 Apr 2022 08:32:18 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id AAF3D10F0D3; Fri, 8 Apr 2022 08:32:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649406736; x=1680942736; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=/LgYqTlnKcchwTNADAwEegeOat2UUCkUTMqrDGUnhvY=; b=KAbV+hmpOy4u7R2REbPuiEKX2tCbPQWcukGnGUICtM/EBDr0AbDRXHDC cuAw8nqtvIiHQW3REQZ/Kr41jNboNYTo2gKRY7f7VI2J/o1ojSFSJKjGc ZXfsCKwmz5rfwgV+EZ76KgzLJ6ihsqxIXUtDkdgdEbyiik1iNdm+MSchY p0+xLmvOv4AmGfw+m7Hm2Pnwe7lRJiMpFnIxKDRTS+vhpGwcwImPgg7Qh ZIlN+aEObDaz0KBzLQ+ADFwZvni4gzL7r5BrVv4aWYtOq3nU5q4yo2N3c Pg2FZphi/A7ZKp7gHAqiimOpfyIEX7OSHFbr4TmDdigjuzhsRShsyuBwy Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10310"; a="261538161" X-IronPort-AV: E=Sophos;i="5.90,244,1643702400"; d="scan'208";a="261538161" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2022 01:32:16 -0700 X-IronPort-AV: E=Sophos;i="5.90,244,1643702400"; d="scan'208";a="723312874" Received: from ajomalle-mobl.ger.corp.intel.com (HELO [10.252.1.141]) ([10.252.1.141]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2022 01:32:14 -0700 Message-ID: Date: Fri, 8 Apr 2022 09:32:12 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-GB To: =?UTF-8?Q?Christian_K=c3=b6nig?= , intel-gfx@lists.freedesktop.org References: <20220407164532.1242578-1-matthew.auld@intel.com> <1a4ebf85-4447-8f1b-b8cb-2fe0ad0372a1@amd.com> From: Matthew Auld In-Reply-To: <1a4ebf85-4447-8f1b-b8cb-2fe0ad0372a1@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915: fix broken build X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 07/04/2022 17:49, Christian König wrote: > Am 07.04.22 um 18:45 schrieb Matthew Auld: >> I guess this was missed in the conversion or something. >> >> Fixes: 7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4") >> Signed-off-by: Matthew Auld >> Cc: Christian König >> Cc: Daniel Vetter > > My best guess is that this is a rebase/merge conflict. I'm 100% sure > i915 was compiling fine before I pushed the patch. > > Anyway Reviewed-by: Christian König for the > series. Christian, could you merge the first patch? I need to re-spin the second patch it seems. > > Thanks, > Christian. > >> --- >>   drivers/gpu/drm/i915/i915_deps.c | 2 +- >>   1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_deps.c >> b/drivers/gpu/drm/i915/i915_deps.c >> index 999210b37325..297b8e4e42ee 100644 >> --- a/drivers/gpu/drm/i915/i915_deps.c >> +++ b/drivers/gpu/drm/i915/i915_deps.c >> @@ -226,7 +226,7 @@ int i915_deps_add_resv(struct i915_deps *deps, >> struct dma_resv *resv, >>       struct dma_fence *fence; >>       dma_resv_assert_held(resv); >> -    dma_resv_for_each_fence(&iter, resv, true, fence) { >> +    dma_resv_for_each_fence(&iter, resv, dma_resv_usage_rw(true), >> fence) { >>           int ret = i915_deps_add_dependency(deps, fence, ctx); >>           if (ret) >