Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2367092pxb; Mon, 20 Sep 2021 20:18:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykkVI6QGnJppazmkkN8XIMiALmXm6pEauH7DV8e86zyIPH3L+kdw+SqltDj7njb9jkKCFo X-Received: by 2002:a6b:f007:: with SMTP id w7mr21490100ioc.112.1632194289909; Mon, 20 Sep 2021 20:18:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632194289; cv=none; d=google.com; s=arc-20160816; b=yiq6TOt4HIjAqgHGRMTNymtn4qYc/Tz+Bd5N/+jlqHytcdZ8vGIN2KCBgj82sviL2+ no8DE3i6Kb8kg4v8Wj56kIO8dkxQJ3elsrsH7+/NBK7jj/bYxBLVxKdG+TlsMEhAoQc+ P0wgLJtsqzPZtcDtSJS0MuIceTKizX3yjyqwaWEWDQgTG9YI5/bhrBAEcjkWTL9M44E/ Kt1WU25JYJnNBybgJkZWyh6EYFkXogmftgXZ3SybTvxAAXgHaZDkVKaegoefEfsVETAA CBrITbGamUGmMFNlMgSA7twuoEtiovfNYa6OWyvAc78Qu/CDy6tM37+sZPAmWXLlUIgj k7Iw== 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=71s/u4grI7mtbJ0xA9D325jwPnAhcOW4chljA4ysQqg=; b=N8hRnNzMeG1Bci/BS0Mgf/QUH4cNJvNUEbdPWqq664GYDtCff1835z+Lqn/s7vLAMK RUFfVSaYcXPKQhV3WnLeyS7xDLkvcpVpx38h5BFr0O+7ejdII0VZvmRnh+AUERw7jPDq 1cyGdqg7y+ORrWOrcEr1Q5QibaGLBTLDx0cktVWErfvDvbPoIVzgjQrssXReM0/9lyQw OEyHx1PhGdnYiJ+O4kx7epsSnyeomKeS0M1nTt/cn/+oXxCx4MsTxgJsEs5oVL3lApHI guIG1Sv3T13l6sOcEUN/wP7mzOe4N+O3k5NVFq90sAXkOSKqme9kYae+pK7vHkAW+i02 SGvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=onNr7Rap; 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 o3si3420990ilk.81.2021.09.20.20.17.59; Mon, 20 Sep 2021 20:18:09 -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=onNr7Rap; 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 S1359489AbhITSYN (ORCPT + 99 others); Mon, 20 Sep 2021 14:24:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:40990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357928AbhITSQ5 (ORCPT ); Mon, 20 Sep 2021 14:16:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 816BC61A64; Mon, 20 Sep 2021 17:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632158545; bh=EGHgnibzqYya6Ch+ZLle0Aa1249hycTtjyFaBntuLkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=onNr7RapfUe1nRRSP84/el/o/arf4yE92yvQoZ4XWxS3xktIy0FgIH/sd77e/br9w JmcZJWNLew+HhzfpPfYUaPe40iHIuYHVEMUITeqeFrd1OTI3nZvFKTWKU+fQS0ycYn zhoqBS5iMSNB5ST+Zn/1jGPBhsoIS0SRX0aYV2Zg= 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.4 188/260] drm/amdgpu: Fix BUG_ON assert Date: Mon, 20 Sep 2021 18:43:26 +0200 Message-Id: <20210920163937.508232655@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163931.123590023@linuxfoundation.org> References: <20210920163931.123590023@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 @@ -200,7 +200,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;