From patchwork Mon Aug 7 16:32:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 132253 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1580787vqr; Mon, 7 Aug 2023 09:56:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/BotA/p8z1yfnme6fQWbetyH5MNhiNpuFpUnb0Stoi1dHQxd/7t/Bqs6ozq1Lsg3Aed2V X-Received: by 2002:a05:6808:1446:b0:3a3:e638:78d2 with SMTP id x6-20020a056808144600b003a3e63878d2mr9585505oiv.12.1691427414735; Mon, 07 Aug 2023 09:56:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691427414; cv=none; d=google.com; s=arc-20160816; b=iUI7L2B7lAnDBFl2qJ3idYVJpMwvSP5GHdgpAcfwYClPDtZTSL7YOayAcaQqe/V91E ZunlFUAMM7YjKMnapu5WFE2Ttw3m0BLW6nkoXTz29WFPgIVea05+F9J/sREoxlq+OLM1 7/ByrQ4GA3JyB06AbmgEZ+BV4iwnAgO64ZWZRd3umR5uF0zvQsuZ7076F5FoSYs80r/Q jCHl6tV5t+aW8aMGKQgMIT2AmeiWeWpF9sbqCW7TfZQLaAwMR0RraDfTXIRPr/Q+Do2T CG55kibB6Dqm0GHtbtq9LUJrfyXgpf0FO4I6PWffZ4KOcvx4OcbAsKXSh+pS/+EoKW8i 2uCQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IfDXzRQJmq7hjHOSakYboiQj+aP0Hf7JLmie7OP7ZJg=; fh=GTMRa798tUeRcvs7yWQ0m0iKc+nnvwGV0DFH12oflss=; b=QqREmkYEE9a5FF1xhnU07QGdRgZhj2XGs3GTplGK4yShKJpbXvMgetrdBqT1FV4TS3 F4sHS95LXr32+FyyRWY4ySNexUtNcmg67eYjIBYgOF3xuBBCrm95RrcqvVK5snvU5RUk e+ZJ5LQ8q1er9hlS8x1/6alS3Sc8vCtj9R8/N0RAB1XLNhRAt359nDD9SweTzzYSSFOZ VPVEUk1B2Ue1QoEdpg8M6PUjsBNk25LpKI6aK4+wuQgbp2JC3hHq/uhJLxcNgWcuPtfy sCzB0HZSPQcKr70J2yStuq85SM+lr9ziHDAbb5gukXUsuoNO/3NOYAaS5X/VKjFFBzbQ rkYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VLI6BQEx; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v188-20020a632fc5000000b0055c86d1e5e6si5727983pgv.602.2023.08.07.09.56.41; Mon, 07 Aug 2023 09:56:54 -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=VLI6BQEx; 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 S231128AbjHGQeD (ORCPT + 99 others); Mon, 7 Aug 2023 12:34:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230162AbjHGQeB (ORCPT ); Mon, 7 Aug 2023 12:34:01 -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 BDFDD2100 for ; Mon, 7 Aug 2023 09:32:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691425968; 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: in-reply-to:in-reply-to:references:references; bh=IfDXzRQJmq7hjHOSakYboiQj+aP0Hf7JLmie7OP7ZJg=; b=VLI6BQEx0OXepYt0oWzQjZdQ8YEkjQOhYkh5J70+wVWTFcGKihg1ffn97KZZFNT7gN1mN7 XEe8WrrGsCd5CAu6HJ1MZ/pvFFiq9MnW99WyroOjoKlzNO69UgvjSpIY9PqycADW06kBe0 eu9j5N/Ucm5jPRP0Zg0I6DB4if1BK6Q= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-503-uPTPvyvAPdW71RYkHaqDHw-1; Mon, 07 Aug 2023 12:32:47 -0400 X-MC-Unique: uPTPvyvAPdW71RYkHaqDHw-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-99bcfdaaa52so320321066b.0 for ; Mon, 07 Aug 2023 09:32:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691425966; x=1692030766; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IfDXzRQJmq7hjHOSakYboiQj+aP0Hf7JLmie7OP7ZJg=; b=e/KLjfstPItSxElT/fmQhC5Sli0GpAC+V81jxQrzglt6dFwfQPWArOuLbXutMJHbXP tCNzNMVPc9QWKwnyUGVpJOPu4FKzX4n94h4ptKPUKk69T4Tj1eg8IZt4jiv8lKj7xlEO ytyaeKabM49lFJ0JgK54+5jBNaJtJzBW6t96vcFCyr0V305I9lCVJwvTDYHjBWgIIm7Q v8Vmmug78iC0WR2//iuZXvTMWBgd2uuUrawTkdTxwZPNkP1DbpMTFYPEhW8x9lgYt/0c ORiAi7uhCMVaqaXyW0OYOjMs1nHMyYKf2InI8u1I4UuJL+7S6s4BsposILUp+T1QVMt2 iKtw== X-Gm-Message-State: AOJu0Ywk0kTXQGobR+Hz5ktk9aO3J5+bVgAcl5yLFdcO9TwrlgYWibvN 1lKQfCjyecVlaHBZ4co+v/53PBHoPIA3sTLJvEcggdghKfn79IOfWdZMn2QUAWyZSrr4lPBoego cRLzo6+DnfMx2HTr9MkPEgErx X-Received: by 2002:a17:906:31c1:b0:99b:c0f0:77fe with SMTP id f1-20020a17090631c100b0099bc0f077femr8075279ejf.69.1691425966377; Mon, 07 Aug 2023 09:32:46 -0700 (PDT) X-Received: by 2002:a17:906:31c1:b0:99b:c0f0:77fe with SMTP id f1-20020a17090631c100b0099bc0f077femr8075269ejf.69.1691425966094; Mon, 07 Aug 2023 09:32:46 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id o17-20020a17090608d100b00988dbbd1f7esm5397484eje.213.2023.08.07.09.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 09:32:45 -0700 (PDT) From: Danilo Krummrich To: airlied@gmail.com, daniel@ffwll.ch, bskeggs@redhat.com, kherbst@redhat.com, lyude@redhat.com, sfr@canb.auug.org.au Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich , kernel test robot Subject: [PATCH drm-misc-next 1/5] nouveau/dmem: fix copy-paste error in nouveau_dmem_migrate_chunk() Date: Mon, 7 Aug 2023 18:32:22 +0200 Message-ID: <20230807163238.2091-2-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230807163238.2091-1-dakr@redhat.com> References: <20230807163238.2091-1-dakr@redhat.com> MIME-Version: 1.0 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_BLOCKED,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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773590192811926147 X-GMAIL-MSGID: 1773590192811926147 Fix call to nouveau_fence_emit() with wrong channel parameter. Fixes: 7f2a0b50b2b2 ("drm/nouveau: fence: separate fence alloc and emit") Reported-by: kernel test robot Reported-by: Stephen Rothwell Reviewed-by: Karol Herbst 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);