Received: by 2002:a05:6359:6284:b0:131:369:b2a3 with SMTP id se4csp1242007rwb; Sat, 5 Aug 2023 10:04:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFn3rG4bBk5EcmryRMy/fHwpULj3gjD2//HMc0vZXIyWU6oupXeGkYDvni78KnUqKER+EA9 X-Received: by 2002:a17:90b:1d88:b0:263:5d25:150c with SMTP id pf8-20020a17090b1d8800b002635d25150cmr3251756pjb.29.1691255087994; Sat, 05 Aug 2023 10:04:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691255087; cv=none; d=google.com; s=arc-20160816; b=VOQe3T0AWN5gcJLH/7BSFGQriF1S5H6l0XA0P49UE339fINhCrUtldBpCKCBZd9d23 J4w7uMOC9KXtMCN2nxfWPTHRX5PMlDJjLQbKs5FJbhKuRo9Ko96FNTfnMvsYVVaovOjO i/q1LAfOpXPD63nLp9D6ifmvsRydkejPoGlHrRfulrydqTyzWYAs7Mu4jHMXKeXme7rh YwW/j/r/sVg/61CThIvurBcQT1RTwWQ4A9vlvqodO4yr1op5riiFQltnMJVgoWYG4lvo IHxuuTLieGEfh/N3VElu43S4XpiAm+cm2U/pSLb++KJHtukl/lSvhlN7bK2UN2GtHhU/ X5Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=94zmfgo0irut0mqrSKRpC00gDlp8lHtPNk77GMVRJ94=; fh=TSEvHXNjwt1gTLZ2mQybtRWUq/MGA/EEY+qNWH/IcMY=; b=G51FLm5Gx83LZz+nYy83QfDaRS0zDJ3HL9UdRIw4pm52cgc/fghVH+d4lS6623wR/C mqHzYbt4ybyxsc577dljxg6ySmEnnLcpl+HKzCRA/vy7u+yiJVYMLGRJx5CAlF79tVrA IirkWUnkyQmdYYjJztr1E0+PXq0dAaTY2V768ZqOzpMqpO+ZYBTX9IalswMj5EPFb1QE SBUl4U5uXam34PRU3K3A+nC8KkDWh0oMSJL1pwHIVJwhEnUvR2wRZ4ERem0jZd1pG9Kz i1gXGj0Z609LRFVvgJmu80h8zWHnvL50J11lqatQxkpR6NaN1qnXfaWOEBptiWq2eIKt lQ3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="S/NIb78U"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lw11-20020a17090b180b00b002685065230asi7351684pjb.37.2023.08.05.10.04.36; Sat, 05 Aug 2023 10:04:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="S/NIb78U"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229915AbjHEQB0 (ORCPT + 99 others); Sat, 5 Aug 2023 12:01:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbjHEQBZ (ORCPT ); Sat, 5 Aug 2023 12:01:25 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DB3CE6F for ; Sat, 5 Aug 2023 09:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691251236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=94zmfgo0irut0mqrSKRpC00gDlp8lHtPNk77GMVRJ94=; b=S/NIb78U33F3USUHDXl0AQ6TI4CSx3R7kVtpQ0E5sQgb02VftjRFqDWC39F5QLXEfzGa4K nta/C4Es+CNw1Xzjw4GgM46EWfSUQ960MMoPti09BT9cf+vCWmiHCbTw+RM0mTUaW42nhU Cp3wH3YV96YFbvPZlCjnjsA4kisIJyA= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-7-YBH9yT2HMBOA7h656mF_dw-1; Sat, 05 Aug 2023 12:00:33 -0400 X-MC-Unique: YBH9yT2HMBOA7h656mF_dw-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-978a991c3f5so208317666b.0 for ; Sat, 05 Aug 2023 09:00:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691251232; x=1691856032; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=94zmfgo0irut0mqrSKRpC00gDlp8lHtPNk77GMVRJ94=; b=HWnOfzehKmkO40lKWNQLtL1VgEHgPMZEt0zDemWOC74MqLe4LJvdT1PxdBwXbItnTX e4k5Y1V1m4HDsbItGbqATCK2Pwnap24Q04hfii5/hmPOb8t71QHtJvRNIvZ3Cpn7adxR 7CM3yxN9ZZ257msFL9PYpJi9skr9Uag6r6TN8akQjm9olo1UqzICQhTQdBJje3Eg/n4x 7BKV1LeAGwirDvqLGgUcQEeSpjOOAOuiRcUrdZB00gsT8lhgzzqgq+3ZFP1QTIHgy2qi ohNLk82x0TsHTpMAaGlOwPD+pJlNoCGjUPEHW5PPQCQjG5VVbJsFTS1XU208R+5P0jHB ellA== X-Gm-Message-State: AOJu0YyxxHiQXj2I3Azz3pYUUMJm5es+fqeSByM/0PDXPuq0XPKaf0il 9D3bMYOkdAqbQvyrkVtNp5abU9RSQBiIy6kzOBZ9PwbIIrPahu5jlcMy0DhKgDr7aEW3e4j33Nq l0F/EUUl8y3uoDiVUlTGP4lkr X-Received: by 2002:a17:906:51d7:b0:994:9ed:300b with SMTP id v23-20020a17090651d700b0099409ed300bmr4797609ejk.16.1691251232461; Sat, 05 Aug 2023 09:00:32 -0700 (PDT) X-Received: by 2002:a17:906:51d7:b0:994:9ed:300b with SMTP id v23-20020a17090651d700b0099409ed300bmr4797582ejk.16.1691251232105; Sat, 05 Aug 2023 09:00:32 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id x2-20020a1709060a4200b00993b381f808sm2856900ejf.38.2023.08.05.09.00.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Aug 2023 09:00:30 -0700 (PDT) From: Danilo Krummrich To: airlied@gmail.com, daniel@ffwll.ch, bskeggs@redhat.com, kherbst@redhat.com, lyude@redhat.com Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next] nouveau/dmem: fix copy-paste error in nouveau_dmem_migrate_chunk() Date: Sat, 5 Aug 2023 18:00:15 +0200 Message-ID: <20230805160027.88116-1-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix call to nouveau_fence_emit() with wrong channel parameter. Fixes: 7f2a0b50b2b2 ("drm/nouveau: fence: separate fence alloc and emit") Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c index 4ad40e42cae1..61e84562094a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -678,7 +678,7 @@ static void nouveau_dmem_migrate_chunk(struct nouveau_drm *drm, } if (!nouveau_fence_new(&fence)) - nouveau_fence_emit(fence, chunk->drm->dmem->migrate.chan); + nouveau_fence_emit(fence, drm->dmem->migrate.chan); migrate_vma_pages(args); nouveau_dmem_fence_done(&fence); nouveau_pfns_map(svmm, args->vma->vm_mm, args->start, pfns, i); base-commit: 82d750e9d2f5d0594c8f7057ce59127e701af781 -- 2.41.0