Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4570070pxv; Tue, 6 Jul 2021 04:18:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUufQmh6VTRGuh1VOlRnhNTC3sOhB+kD+7gmuna4btIU4UmK8VheJcDzUDqVd2lSPdNIio X-Received: by 2002:a02:880f:: with SMTP id r15mr12474712jai.36.1625570318184; Tue, 06 Jul 2021 04:18:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570318; cv=none; d=google.com; s=arc-20160816; b=znKe48Hyc0lin4scdDIEfPCRd6Mr1/eVgnzm8VwzRwi4yyuagf3ENI8PwD+0txq0MD /ZbB8kXxXTy06SyRp1Pie1bSpReaSTZZBidDkhjPrspZ9uBOECJ+1sP4QMN7iQmJJbEH J/VMN/NI3YgcUK92al9a/DcTBA56TG4uOZwXVsHOOhVqSNs43nPpcuC2mH/tNa1LfAfa nP5c8O8nyvRjswioanFwbMeCo8CtjHcGe5lert7JNKARmvjrfZF+8WGWRxPgZ86rnF78 5d0nZndR5j+rx36nt8nCeFVoqENjtooERRdHDtt8Mdu4plZcXpCHjO41wcUdN0d6XMR+ eNzQ== 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=8A+J1T0oEyGT52cwp/jpxmwur+Sbe9SAaz80YSvsgz8=; b=KAqv+HQZB/8LQ2eGgjQ/srOou/WECBOXo0qtag0L3vdvxpyD4DX73IZBW1umdejhP5 /ZqR4V+/wMo5r7jyFmC/Sg82nSoZwX+gnZJRSeEahZWkcwKj4hz2TfFGnZ5KSkFRmf/h 6iktN7qT/qDyuG+SB8M8hkheEQ3wB/qsNlax2DvvSU/LIlqW0S2+4KB164j/2c92Pkh/ KbQexKT1diTxMNsx9B+iB9TegjAu/wH08cYE3JMquU6UW5h19t0z/I3+mKuqqiKZL6sz 4UNVmQI/iKR6hMbnqx8PEnNUmLcZdUa0KkStI9eug4eOhvZBLtll1tg50Dq66yarUG6A tsNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RD+7Kv6k; 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 j19si2015056jat.116.2021.07.06.04.18.26; Tue, 06 Jul 2021 04:18:38 -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=@kernel.org header.s=k20201202 header.b=RD+7Kv6k; 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 S232864AbhGFLUh (ORCPT + 99 others); Tue, 6 Jul 2021 07:20:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:54420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231925AbhGFLSV (ORCPT ); Tue, 6 Jul 2021 07:18:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E0A9A61C28; Tue, 6 Jul 2021 11:15:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570142; bh=MO40KtTCzKgw6sjeqzbXc98VsztHqIQAJjBSUAiLKnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RD+7Kv6kH/l0O7qAPNY5I2bbcx2Brxw5dvkwnVefshVdnYKhmNylk4mBE5n5V2tTL TsIR/+YFhlmRTc2bKdftll13IsDFc4P2A5DqBpY+yefnS3+UUMUR6Taxw0A00azGqx 9JQBlNP6l5lOVoQ9ZXAIRP7JJn+ecqiopq40ukM9szNstOk73bu2yiFWWBz1aW8SAc VFJ7uKJj9qSfL+XvbsXi9lZXq1KuSkwVpSDc2fI9mCAc8eldohAufG+1VjYaJZm0XX GQNJSS6cxTGIhZzXe067nPj4ytH3u+gTS1O/i+TxmcEZXvhyUw9apmfFDEquGuDTbW 4VqKMkUKojGVA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kevin Wang , "Stanley . Yang" , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.13 067/189] drm/amdgpu: fix sdma firmware version error in sriov Date: Tue, 6 Jul 2021 07:12:07 -0400 Message-Id: <20210706111409.2058071-67-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-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: Kevin Wang [ Upstream commit 2b8f731849800e3948763ccaff31cceac526789b ] Re-adjust the function return order to avoid empty sdma version in the sriov environment. (read amdgpu_firmware_info) Signed-off-by: Kevin Wang Reviewed-by: Stanley.Yang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c index 240596b25fe4..9ab23947a151 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c @@ -145,9 +145,6 @@ static int sdma_v5_2_init_microcode(struct amdgpu_device *adev) struct amdgpu_firmware_info *info = NULL; const struct common_firmware_header *header = NULL; - if (amdgpu_sriov_vf(adev) && (adev->asic_type == CHIP_SIENNA_CICHLID)) - return 0; - DRM_DEBUG("\n"); switch (adev->asic_type) { @@ -182,6 +179,9 @@ static int sdma_v5_2_init_microcode(struct amdgpu_device *adev) (void *)&adev->sdma.instance[0], sizeof(struct amdgpu_sdma_instance)); + if (amdgpu_sriov_vf(adev) && (adev->asic_type == CHIP_SIENNA_CICHLID)) + return 0; + DRM_DEBUG("psp_load == '%s'\n", adev->firmware.load_type == AMDGPU_FW_LOAD_PSP ? "true" : "false"); -- 2.30.2