Commit dbd1003d authored by Changfeng's avatar Changfeng Committed by Alex Deucher
Browse files

drm/amdgpu: disable 3DCGCG on picasso/raven1 to avoid compute hang 



There is problem with 3DCGCG firmware and it will cause compute test
hang on picasso/raven1. It needs to disable 3DCGCG in driver to avoid
compute hang.

Signed-off-by: default avatarChangfeng <Changfeng.Zhu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent d5375156

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

+7 −3
Original line number Diff line number Diff line
@@ -4943,7 +4943,7 @@ static void gfx_v9_0_update_3d_clock_gating(struct amdgpu_device *adev, 
	amdgpu_gfx_rlc_enter_safe_mode(adev);



	/* Enable 3D CGCG/CGLS */

	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_GFX_3D_CGCG)) {

	if (enable) {

		/* write cmd to clear cgcg/cgls ov */

		def = data = RREG32_SOC15(GC, 0, mmRLC_CGTT_MGCG_OVERRIDE);

		/* unset CGCG override */
@@ -4955,8 +4955,12 @@ static void gfx_v9_0_update_3d_clock_gating(struct amdgpu_device *adev, 
		/* enable 3Dcgcg FSM(0x0000363f) */

		def = RREG32_SOC15(GC, 0, mmRLC_CGCG_CGLS_CTRL_3D);



		if (adev->cg_flags & AMD_CG_SUPPORT_GFX_3D_CGCG)

			data = (0x36 << RLC_CGCG_CGLS_CTRL_3D__CGCG_GFX_IDLE_THRESHOLD__SHIFT) |

				RLC_CGCG_CGLS_CTRL_3D__CGCG_EN_MASK;

		else

			data = 0x0 << RLC_CGCG_CGLS_CTRL_3D__CGCG_GFX_IDLE_THRESHOLD__SHIFT;



		if (adev->cg_flags & AMD_CG_SUPPORT_GFX_3D_CGLS)

			data |= (0x000F << RLC_CGCG_CGLS_CTRL_3D__CGLS_REP_COMPANSAT_DELAY__SHIFT) |

				RLC_CGCG_CGLS_CTRL_3D__CGLS_EN_MASK;

drivers/gpu/drm/amd/amdgpu/soc15.c

+0 −2
Original line number Diff line number Diff line
@@ -1392,7 +1392,6 @@ static int soc15_common_early_init(void *handle) 
			adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG |

				AMD_CG_SUPPORT_GFX_MGLS |

				AMD_CG_SUPPORT_GFX_CP_LS |

				AMD_CG_SUPPORT_GFX_3D_CGCG |

				AMD_CG_SUPPORT_GFX_3D_CGLS |

				AMD_CG_SUPPORT_GFX_CGCG |

				AMD_CG_SUPPORT_GFX_CGLS |
@@ -1412,7 +1411,6 @@ static int soc15_common_early_init(void *handle) 
				AMD_CG_SUPPORT_GFX_MGLS |

				AMD_CG_SUPPORT_GFX_RLC_LS |

				AMD_CG_SUPPORT_GFX_CP_LS |

				AMD_CG_SUPPORT_GFX_3D_CGCG |

				AMD_CG_SUPPORT_GFX_3D_CGLS |

				AMD_CG_SUPPORT_GFX_CGCG |

				AMD_CG_SUPPORT_GFX_CGLS |