Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp446186pxb; Thu, 9 Sep 2021 04:47:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqoN2gMHKlODcZaFTv6B4M59XRp/L1sL7G6h3PCk4bnXFYlg2Hf/eL3Eyq6I2mNWYgjfM0 X-Received: by 2002:a17:906:1299:: with SMTP id k25mr2903093ejb.139.1631188041305; Thu, 09 Sep 2021 04:47:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631188041; cv=none; d=google.com; s=arc-20160816; b=QNLXL8+H3fMk15PVtPSu6x4fd57p7mjZm8HZJj/0XFhAhZEyxzJnQaoRf8OZ9jCPW5 yfJibmWUU55+hA8Y64EXo4KYq6+UYD3nCTN4dQmemliFZNaJg9bjl5XNYc3K7bcws2JY NKL8QrrOWmE4mPGn1jSpLygwKNSfNPOqDTsrLRWDmDCDsd7vSYw8iSwiAAYVP3jjFo2S Oyv9yfsVRLeY8FmzvyH9DbT4ohASm33ypYxuweSiEp2MGIIHn8tedN3UPDQB+RUBnlKZ HRti6Hkw42k7MlIeRajGSLttwyBrGjEuHyw/Do7r9yNgv1OlJvGYzNjgTqeltcH+gj87 8TWQ== 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=4Zil0NsATbnbGNmXkBY1bseK3m2KLNHyD6PDjtSUgn0=; b=O5XlGOS1Fva7igRp2nNgzI5Bmrj09Y3ocPGs7I2WPR5d29tWFVFHh8kP5MOOiphmwb bOjleTP8AP28Pdg65Y89fh8RZpzy0/3hsqMYoAoY9B2FarU+L3YVpH+tpKeFzMkgD5m8 iqGtzXqvcJRmfViLBA/aScD940bUsv5KryPkJlSSlkx7tKovGmWkqAtIN80NB5/B1W4t 8+OIRl79vEOrZb9MpJVyPWXNYRabMban9HmL/HoXHh+MsQck7isVZFw0eqcplDZ6Ekwc NrREajVI8q1SMBgJFkW2jAH/N39KdE0M1Y8atxY1D0zhTpunmy5sJoh/LtDuPbqqPP/6 go8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dEZm4Qmk; 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 hr13si1453435ejc.66.2021.09.09.04.46.54; Thu, 09 Sep 2021 04:47:21 -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=dEZm4Qmk; 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 S235604AbhIILqn (ORCPT + 99 others); Thu, 9 Sep 2021 07:46:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:46342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239649AbhIILoR (ORCPT ); Thu, 9 Sep 2021 07:44:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E29CE6103D; Thu, 9 Sep 2021 11:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187746; bh=njpbiNEWf9HBmJK+Vfx/Ddd6uYqglqFzFXSzkzQoiHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dEZm4Qmkny2AzCgDVexe13mddJtQNMEbK/mLx3cH6wBgee4Un0jwjTl1hQ69vK255 uZmDt/ZiEa9ixLAESpBXFyS1igyz+/51KY5XRbBX0VT3v3gUEdwHCT0lAHbCXK5+EN Mr/tZU2E+VAoma5po28KeGa0pR2nbpH0L5Xtws4mh6VQWoM+ozRRUQy7Etaegax2er ACmMRmvKrm0+RQ2Ca1R+3kywnhcxuf4NvStOjefidgF4y5sUWnEEpFc9q7Qw4iBFYi m9xLpAgMYBZy2SfFS4aMcpH35xpIQziSLnbl2tcAeMFqO/Za37QaCRYZBHPuyY1uFA RlJdaKw3+b/tA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oak Zeng , Christian Konig , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.14 062/252] drm/amdgpu: Fix a printing message Date: Thu, 9 Sep 2021 07:37:56 -0400 Message-Id: <20210909114106.141462-62-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-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: Oak Zeng [ Upstream commit 95f71f12aa45d65b7f2ccab95569795edffd379a ] The printing message "PSP loading VCN firmware" is mis-leading because people might think driver is loading VCN firmware. Actually when this message is printed, driver is just preparing some VCN ucode, not loading VCN firmware yet. The actual VCN firmware loading will be in the PSP block hw_init. Fix the printing message Signed-off-by: Oak Zeng Reviewed-by: Christian Konig Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c index 284bb42d6c86..121ee9f2b8d1 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c @@ -119,7 +119,7 @@ static int vcn_v1_0_sw_init(void *handle) adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw; adev->firmware.fw_size += ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE); - DRM_INFO("PSP loading VCN firmware\n"); + dev_info(adev->dev, "Will use PSP to load VCN firmware\n"); } r = amdgpu_vcn_resume(adev); diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c index 8af567c546db..f4686e918e0d 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c @@ -122,7 +122,7 @@ static int vcn_v2_0_sw_init(void *handle) adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw; adev->firmware.fw_size += ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE); - DRM_INFO("PSP loading VCN firmware\n"); + dev_info(adev->dev, "Will use PSP to load VCN firmware\n"); } r = amdgpu_vcn_resume(adev); diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c index 888b17d84691..e0c0c3734432 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c @@ -152,7 +152,7 @@ static int vcn_v2_5_sw_init(void *handle) adev->firmware.fw_size += ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE); } - DRM_INFO("PSP loading VCN firmware\n"); + dev_info(adev->dev, "Will use PSP to load VCN firmware\n"); } r = amdgpu_vcn_resume(adev); diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c index 47d4f04cbd69..2f017560948e 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c @@ -160,7 +160,7 @@ static int vcn_v3_0_sw_init(void *handle) adev->firmware.fw_size += ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE); } - DRM_INFO("PSP loading VCN firmware\n"); + dev_info(adev->dev, "Will use PSP to load VCN firmware\n"); } r = amdgpu_vcn_resume(adev); -- 2.30.2