Probably better to revert each patch individually for upstream. With
that changed,
Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
Alex
On Thu, Jun 17, 2021 at 10:23 PM Yifan Zhang <yifan1.zhang@xxxxxxx> wrote:
>
> Revert "drm/amdgpu/gfx9: fix the doorbell missing when in CGPG issue."
> Revert "drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell."
>
> This revert commits:
> a3b4cfb09aa9e73cc48caff77efc161a396aeddb.
> feae47198886d0df7b43876916a0e4366f159b45
>
> Reason for revert: side effect of enlarging CP_MEC_DOORBELL_RANGE may
> cause some APUs fail to enter gfxoff in certain user cases.
>
> Signed-off-by: Yifan Zhang <yifan1.zhang@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +-----
> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 +-----
> 2 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index 7bfe6f9d3a52..15ae9e33b925 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -6974,12 +6974,8 @@ static int gfx_v10_0_kiq_init_register(struct amdgpu_ring *ring)
> if (ring->use_doorbell) {
> WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,
> (adev->doorbell_index.kiq * 2) << 2);
> - /* If GC has entered CGPG, ringing doorbell > first page doesn't
> - * wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround
> - * this issue.
> - */
> WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,
> - (adev->doorbell.size - 4));
> + (adev->doorbell_index.userqueue_end * 2) << 2);
> }
>
> WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 922420a2c102..044076ec1d03 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -3675,12 +3675,8 @@ static int gfx_v9_0_kiq_init_register(struct amdgpu_ring *ring)
> if (ring->use_doorbell) {
> WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,
> (adev->doorbell_index.kiq * 2) << 2);
> - /* If GC has entered CGPG, ringing doorbell > first page doesn't
> - * wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround
> - * this issue.
> - */
> WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,
> - (adev->doorbell.size - 4));
> + (adev->doorbell_index.userqueue_end * 2) << 2);
> }
>
> WREG32_SOC15_RLC(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,
> --
> 2.25.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
