Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp4412000pxb; Mon, 21 Feb 2022 20:45:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJyhAQvBoMJsg/rFDT+StClXrOujnzEeBLYhjW7pvf5JEDd8plmSECyburk8lINjGk+jwT1F X-Received: by 2002:a62:dd03:0:b0:4f1:1bfa:134c with SMTP id w3-20020a62dd03000000b004f11bfa134cmr10772966pff.14.1645505159439; Mon, 21 Feb 2022 20:45:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645505159; cv=none; d=google.com; s=arc-20160816; b=vAZu8A/u+U4b1SpFaoRCvxF1lIlX6nkk/kG10dG+k/MMeThU/9iVUBT/Si+Q6hgcRD sFRgmlM90CLVWcZPobrAIBwxXogulnBQiN8PBrkvyWLTD9SaWk8MVnhuASQ0b8+mPa14 vSrgNyKas7S87v80+i125PDRz+TSDF7g3dcRLD2iQGpHv+0DiuXXi8QIWDSLzuHMrinu LgiwjOv8Z/w4uXdRRhpMlii1KipST6LoRa80BgfmcVjSv2ZOusacQ9f49oz1yEwT0Z7t eEeW2lzuaL4cCXL4RuXGb6E9dcmvKko6tVJdogRQO1htgEEPdCle5beg9UfBiROYoCkQ HBcw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TSZSxVM5qvbqralZL17qf83QQNlTQlHmgdNRj8XXupI=; b=tysFO1veEWK963NxsziJyqr0vef9AHIct+GdGspKF8U8kfvH7/KU0ErQFFdOgEkMa0 rtr25PUuARz0QpaRm+Dd8hfudLJfEnX8GqsgsT1s3yKrYAYL5i3xqptYXjW5RDT+SuCU fbjq8P1O+lhpcCWrVHFyCYaRTjB57pw9s9rvaTMOUgeh7y8DNGZ7RLWsad5Pa/a6KJJe xSpjYFd6C+3kxaZvf4AMGKR3xNBXzrmgm8gAmFUIezKNSw/q1tBImRX22r6nm9i+R/Oy l2sKeMMV7J+1vHSIRswPnp4FwVYtCHJ+fsVNnf0uL9mkTheqIbentj4G9paTJcR9fAar nWZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=n8xBtWxN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id e27si16865252pgl.309.2022.02.21.20.45.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 20:45:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=n8xBtWxN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 869CB13D49; Mon, 21 Feb 2022 20:28:52 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243736AbiBUJvn (ORCPT + 99 others); Mon, 21 Feb 2022 04:51:43 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:41664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352303AbiBUJrT (ORCPT ); Mon, 21 Feb 2022 04:47:19 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 469213134F; Mon, 21 Feb 2022 01:19:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D6B4D608C4; Mon, 21 Feb 2022 09:19:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD3FEC340E9; Mon, 21 Feb 2022 09:19:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645435162; bh=/olF6Us9lbxAbXC7th3DTXiim40Q8iwY7LdThfGvC7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n8xBtWxNr/QnNqo38at2TvMl4zkHS7dDQbVQ2WHJRTaYIw2tCcs7JThI3Oos15w7k +gvyCM4qEz7A5fOqGKOpuyRqkO3IkU9GFi74tca4AJnj5zliVbces3dY5DFIlY9eoR 7cocurucT524UNn092/AmFrkz6YUlIaVvUblOPR0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , Felix Kuehling , Alex Deucher , Sasha Levin Subject: [PATCH 5.16 066/227] drm/amdgpu: fix logic inversion in check Date: Mon, 21 Feb 2022 09:48:05 +0100 Message-Id: <20220221084937.063080395@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084934.836145070@linuxfoundation.org> References: <20220221084934.836145070@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Christian König [ Upstream commit e8ae38720e1a685fd98cfa5ae118c9d07b45ca79 ] We probably never trigger this, but the logic inside the check is inverted. Signed-off-by: Christian König Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index c875f1cdd2af7..ffc3ce0004e99 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1913,7 +1913,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, unsigned i; int r; - if (direct_submit && !ring->sched.ready) { + if (!direct_submit && !ring->sched.ready) { DRM_ERROR("Trying to move memory with ring turned off.\n"); return -EINVAL; } -- 2.34.1