Fixes for 6.1

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.1/drm-amdgpu-fix-missing-error-code-in-gmc_v6-7-8-9_0_.patch b/queue-6.1/drm-amdgpu-fix-missing-error-code-in-gmc_v6-7-8-9_0_.patch
new file mode 100644 (file)
index 0000000..fda6fff
--- /dev/null
+++ b/queue-6.1/drm-amdgpu-fix-missing-error-code-in-gmc_v6-7-8-9_0_.patch
@@ -0,0 +1,97 @@
+From 49e8205ef47a8c958cc53b741435e35dba28c430 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 30 Jan 2024 12:10:38 +0530
+Subject: drm/amdgpu: Fix missing error code in 'gmc_v6/7/8/9_0_hw_init()'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
+
+[ Upstream commit 16da399091dca3d1e48109086403587af37cc196 ]
+
+Return 0 for success scenairos in 'gmc_v6/7/8/9_0_hw_init()'
+
+Fixes the below:
+drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c:920 gmc_v6_0_hw_init() warn: missing error code? 'r'
+drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c:1104 gmc_v7_0_hw_init() warn: missing error code? 'r'
+drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c:1224 gmc_v8_0_hw_init() warn: missing error code? 'r'
+drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c:2347 gmc_v9_0_hw_init() warn: missing error code? 'r'
+
+Fixes: fac4ebd79fed ("drm/amdgpu: Fix with right return code '-EIO' in 'amdgpu_gmc_vram_checking()'")
+Cc: Christian König <christian.koenig@amd.com>
+Cc: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
+Reviewed-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+index ec291d28edff..345f0c9f551c 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+@@ -921,8 +921,8 @@ static int gmc_v6_0_hw_init(void *handle)
+ 
+       if (amdgpu_emu_mode == 1)
+               return amdgpu_gmc_vram_checking(adev);
+-      else
+-              return r;
++
++      return 0;
+ }
+ 
+ static int gmc_v6_0_hw_fini(void *handle)
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+index 979da6f510e8..12411f4c1b9a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+@@ -1110,8 +1110,8 @@ static int gmc_v7_0_hw_init(void *handle)
+ 
+       if (amdgpu_emu_mode == 1)
+               return amdgpu_gmc_vram_checking(adev);
+-      else
+-              return r;
++
++      return 0;
+ }
+ 
+ static int gmc_v7_0_hw_fini(void *handle)
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+index 382dde1ce74c..cec9926e8bdd 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+@@ -1240,8 +1240,8 @@ static int gmc_v8_0_hw_init(void *handle)
+ 
+       if (amdgpu_emu_mode == 1)
+               return amdgpu_gmc_vram_checking(adev);
+-      else
+-              return r;
++
++      return 0;
+ }
+ 
+ static int gmc_v8_0_hw_fini(void *handle)
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+index 409e3aa018f2..3e631aefa791 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+@@ -1861,8 +1861,8 @@ static int gmc_v9_0_hw_init(void *handle)
+ 
+       if (amdgpu_emu_mode == 1)
+               return amdgpu_gmc_vram_checking(adev);
+-      else
+-              return r;
++
++      return 0;
+ }
+ 
+ /**
+-- 
+2.43.0
+

diff --git a/queue-6.1/series b/queue-6.1/series
index cb16ce5e10874aff898f5d15c7ec379a08590746..42b2b44a24c4f71e08acc8d415b71f8acf211a17 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -218,3 +218,4 @@ gve-fix-use-after-free-vulnerability.patch
 bonding-remove-print-in-bond_verify_device_path.patch
 asoc-codecs-lpass-wsa-macro-fix-compander-volume-hack.patch
 asoc-codecs-wsa883x-fix-pa-volume-control.patch
+drm-amdgpu-fix-missing-error-code-in-gmc_v6-7-8-9_0_.patch