Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp162654pxb; Mon, 2 Nov 2020 17:23:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJwF0rPcniHsspM4O0aOsHVKFKosCfLAZ03qG2dwqTrdIq+POCtYkRveP0R8T512uqh5cREp X-Received: by 2002:a50:99cd:: with SMTP id n13mr19497733edb.10.1604366601838; Mon, 02 Nov 2020 17:23:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604366601; cv=none; d=google.com; s=arc-20160816; b=Ifo8IW4qmqEVKc+Q5W2ztqWCwLhCTm3ahn8FFeoJLN9zDkKNFeNhVr4cBqYjL22KHi uSmKr2two8Wuj7c2uN92NjOKwrXwda+XM7n/3kQoXoySBaW9rMJwkdV8GzX75sSQIPQK lVLjILqYEq9g2Fe/2i05+p6a5G2QFoAQqlLiO5TBLrEOhm4q7hYCa3tZGLMiJbkdj/F6 c6aWZColbvGYUePj3TNAJa7y+SlMwuTA1JkLL/GME+XdptBHpakJLyMjTuOdUxHErH31 XmWH9MiI3SDQVnTpD17KWeEFyigZCpxL2N65Rv50mjcZ3k4gFNuZmSBPJIPZ3TxjRpzr N58Q== 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=lwso5UQmFR7X44ENF4WsPrRP7pSNwcGcbXCzbBfzIa4=; b=AjWtYr0m7+eJml+0SIKG6UGLIWh/2O2gXm4PdK+YH+XJ2gq/x7TznmwRCl050cN074 R+I3ETqYwwDpzuZo9Y49TZ6du6CQo3JD+j4tnztGawg0e0eW7PGXnP9eNtwhfEPYPfG+ U0BVpdFEA1CN8VU0PxN+QLqewvGGULhd83umQOw4WEOAyoPpYSEJDJsxuelBODCfDfdg QmUzCyxU7455dTvqrOwfcHOheYVoVjT9eCmf3W+SI87Uz306WQNuQcKKCqG2WL3f2ShH l2M/+NR9ppPgZny9a4n5oEAwnyX4gZBuL70XbrRlnPLkHOd/FumrOA/2kE/346mxM+2S geOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=F01kTDG3; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mm25si4188347ejb.610.2020.11.02.17.22.59; Mon, 02 Nov 2020 17:23:21 -0800 (PST) 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=@kernel.org header.s=default header.b=F01kTDG3; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727645AbgKCBTS (ORCPT + 99 others); Mon, 2 Nov 2020 20:19:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:60924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727554AbgKCBTJ (ORCPT ); Mon, 2 Nov 2020 20:19:09 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 437A5223AC; Tue, 3 Nov 2020 01:19:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366349; bh=vjXUIYLDe4pfWuTDYI0QT5kTiVtf5FanAE2LJ8LQA6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F01kTDG3HhPlM0K5psqcreirM9h1WWvvjaoQQgoOgtIYnfo0VakLD9lansJoRCVhf fcpulk1+OtUTnEtdlctOzCTZ4ykeDXEgZhihASUQLzSbgXmPPvrbTQi059hH5CTioo z1nOGU2JKY7BHCAPSf4qqRqW5kF2zfyrUaEoq2LA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Tianci.Yin" , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.9 21/35] drm/amdgpu: disable DCN and VCN for navi10 blockchain SKU(v3) Date: Mon, 2 Nov 2020 20:18:26 -0500 Message-Id: <20201103011840.182814-21-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201103011840.182814-1-sashal@kernel.org> References: <20201103011840.182814-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Tianci.Yin" [ Upstream commit a305e7dc5fa86ff9cf6cd2da30215a92d43c9285 ] The blockchain SKU has no display and video support, remove them. Reviewed-by: Alex Deucher Signed-off-by: Tianci.Yin Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/nv.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index ca11253e787ca..8254f42146890 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -488,6 +488,14 @@ void nv_set_virt_ops(struct amdgpu_device *adev) adev->virt.ops = &xgpu_nv_virt_ops; } +static bool nv_is_blockchain_sku(struct pci_dev *pdev) +{ + if (pdev->device == 0x731E && + (pdev->revision == 0xC6 || pdev->revision == 0xC7)) + return true; + return false; +} + int nv_set_ip_blocks(struct amdgpu_device *adev) { int r; @@ -516,7 +524,8 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); #if defined(CONFIG_DRM_AMD_DC) - else if (amdgpu_device_has_dc_support(adev)) + else if (amdgpu_device_has_dc_support(adev) && + !nv_is_blockchain_sku(adev->pdev)) amdgpu_device_ip_block_add(adev, &dm_ip_block); #endif amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block); @@ -524,7 +533,8 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT && !amdgpu_sriov_vf(adev)) amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block); - amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); + if (!nv_is_blockchain_sku(adev->pdev)) + amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block); if (adev->enable_mes) amdgpu_device_ip_block_add(adev, &mes_v10_1_ip_block); -- 2.27.0