Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1846253pxb; Thu, 16 Sep 2021 17:43:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0LZjHE1WT/jecJN4TDH3GZND6Ruae5rof+QIOKoC2qMZmJ5nyf4q+AGswIpiXxzI3u/YN X-Received: by 2002:a17:906:308d:: with SMTP id 13mr9171682ejv.570.1631839409635; Thu, 16 Sep 2021 17:43:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631839409; cv=none; d=google.com; s=arc-20160816; b=anIaWt8rxlWklkBz/n3YQUM96FefUI35asSxdY5QzP08ewV6C5DYMAy3GHFRSq3ijl 9Fo1UG45uIwvBsiSJVwKDmamjcb7+ybiK1zV90/SgY+Xz9LMWoVJNuqkKcOtQAGWozmj knr1T/ZHFd40nmz4Yo+uHgdI7OhyBn3opBjlRltQrjLdXfxQ4tMlwwdGReVNvZOXXJ40 SxuE/Im3DoYwYpdcqD3ga3D9wUxqkKJng0gSKJY8PuI6m7SHuGpMXQk33pq4ryc+x9dA lE5ZssFxW5HdAlZLDEjCKjUH1ZzHRQVvJivdvQSWQ0H0ld6k9g8P0w4v2Bhh4edO7eXl DgOA== 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=NHG0UwM01nlz83f5MMJSNnTsgArlSn6jMyXN4E51bxg=; b=oYjJRmpSYFK8bUf1LNiZTRToof1/qqOJNN+MFob7NPeMBnZPqw3EvmW6SZ0lKySIZg ioz+sXUsW2MSW6o0gzuF+7AxYWHRoPqkfl4btINnIr7Vqm9KWZzRroVUmlIQ+jbdzMFE X0Hydu2m/jp1MlAzGo28Ch6mLCpq9oioMw25sOj/dyJ3JImm38yaK1/9ifKZDPG9rIhP v+DmHS8KJ79kOITgxHjdrq+f6kjhnPUWPwY11AVdPy1LcSIr/IAADGgMKlbPF0Z6gJb5 0W6+qJrq/40S8ajePKs16jidV3rynScQY5TsXgDNHMbvV7rKRU70A6dtwwwj5RZLbC7b KBXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=P8sGCBbA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d17si5214293edy.412.2021.09.16.17.43.05; Thu, 16 Sep 2021 17:43:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=P8sGCBbA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345381AbhIPRG6 (ORCPT + 99 others); Thu, 16 Sep 2021 13:06:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:34032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348407AbhIPRCq (ORCPT ); Thu, 16 Sep 2021 13:02:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3527A6121F; Thu, 16 Sep 2021 16:33:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631810030; bh=DW2x+RU45b1S/tNPYWqLvPmZmx2TdfXB6vG2SbKE5mc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P8sGCBbAmoS6DbQHQaHC+gluPkqtmObvMW01XYLW4wjtVvI7t4tUucuDIIdG01i+5 Xzd2knW6tKAGpVAwhLsnj+I1t4/50HQpQQ6Iddm46zQ7TU1q1ZJXoC1g6gi0j9s/4X +Gk0z5wI+cTKIBxfjJDVWfc5MNkS8AVYCBgE1f5M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stable@kernel.org, Andrey Grodzovsky , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 5.13 372/380] drm/amdgpu: Fix BUG_ON assert Date: Thu, 16 Sep 2021 18:02:09 +0200 Message-Id: <20210916155816.705867518@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrey Grodzovsky commit ea7acd7c5967542353430947f3faf699e70602e5 upstream. With added CPU domain to placement you can have now 3 placemnts at once. CC: stable@kernel.org Signed-off-by: Andrey Grodzovsky Reviewed-by: Christian König Link: https://patchwork.freedesktop.org/patch/msgid/20210622162339.761651-5-andrey.grodzovsky@amd.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -202,7 +202,7 @@ void amdgpu_bo_placement_from_domain(str c++; } - BUG_ON(c >= AMDGPU_BO_MAX_PLACEMENTS); + BUG_ON(c > AMDGPU_BO_MAX_PLACEMENTS); placement->num_placement = c; placement->placement = places;