drm/amdgpu: Fix missing error code in 'gmc_v6/7/8/9_0_hw_init()'

From Srinivasan Shanmugam
7110e98840ee6b7009304b1e41c8e6930452a48e in linux-6.6.y/6.6.16
16da399091dca3d1e48109086403587af37cc196 in mainline linux

diff --git a/sys/dev/pci/drm/amd/amdgpu/gmc_v6_0.c b/sys/dev/pci/drm/amd/amdgpu/gmc_v6_0.c
index 2366bdb..d72587b 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/gmc_v6_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/gmc_v6_0.c
@@ -914,8 +914,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/sys/dev/pci/drm/amd/amdgpu/gmc_v7_0.c b/sys/dev/pci/drm/amd/amdgpu/gmc_v7_0.c
index 89cd4f0..76e39d9 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/gmc_v7_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/gmc_v7_0.c
@@ -1103,8 +1103,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/sys/dev/pci/drm/amd/amdgpu/gmc_v8_0.c b/sys/dev/pci/drm/amd/amdgpu/gmc_v8_0.c
index c9af8e4..e178f58 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/gmc_v8_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/gmc_v8_0.c
@@ -1224,8 +1224,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/sys/dev/pci/drm/amd/amdgpu/gmc_v9_0.c b/sys/dev/pci/drm/amd/amdgpu/gmc_v9_0.c
index 0576e19..b53ac67 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/gmc_v9_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/gmc_v9_0.c
@@ -2380,8 +2380,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;
 }
 
 /**