[PATCH] drm/amdgpu: allow direct upload save restore list for raven2

[PATCH] drm/amdgpu: allow direct upload save restore list for raven2

[Alex Deucher]

From: changzhu <Changfeng.Zhu@amd.com>

It will cause modprobe atombios stuck problem in raven2 if it doesn't
allow direct upload save restore list from gfx driver.
So it needs to allow direct upload save restore list for raven2
temporarily.

Bug: https://gitlab.freedesktop.org/drm/amd/issues/1013
Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit eebc7f4d7ffa09f2a620bd1e2c67ddd579118af9)
Cc: <stable@vger.kernel.org> # 5.4.x
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index ab4a0d8545dc..0125ea7c4103 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -2923,7 +2923,9 @@ static void gfx_v9_0_init_pg(struct amdgpu_device *adev)
 	 * And it's needed by gfxoff feature.
 	 */
 	if (adev->gfx.rlc.is_rlc_v2_1) {
-		if (adev->asic_type == CHIP_VEGA12)
+		if (adev->asic_type == CHIP_VEGA12 ||
+		    (adev->asic_type == CHIP_RAVEN &&
+		     adev->rev_id >= 8))
 			gfx_v9_1_init_rlc_save_restore_list(adev);
 		gfx_v9_0_enable_save_restore_machine(adev);
 	}
-- 
2.24.1

Re: [PATCH] drm/amdgpu: allow direct upload save restore list for raven2

[Greg KH]

On Mon, Jan 20, 2020 at 01:24:39PM -0500, Alex Deucher wrote:
> From: changzhu <Changfeng.Zhu@amd.com>
> 
> It will cause modprobe atombios stuck problem in raven2 if it doesn't
> allow direct upload save restore list from gfx driver.
> So it needs to allow direct upload save restore list for raven2
> temporarily.
> 
> Bug: https://gitlab.freedesktop.org/drm/amd/issues/1013
> Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
> Reviewed-by: Huang Rui <ray.huang@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> (cherry picked from commit eebc7f4d7ffa09f2a620bd1e2c67ddd579118af9)
> Cc: <stable@vger.kernel.org> # 5.4.x
> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Now backported, thanks.

greg k-h