RE: [PATCH] drm/amdgpu: fix commit 4ef9d7d
Reviewed-by: Huang Rui -Original Message- From: amd-gfx On Behalf Of Aaron Liu Sent: Tuesday, August 27, 2019 12:33 PM To: amd-gfx@lists.freedesktop.org Cc: Liu, Aaron Subject: [PATCH] drm/amdgpu: fix commit 4ef9d7d For picasso(adev->pdev->device == 0x15d8)(adev->rev_id >= 0x8), firmware is sufficient to support gfxoff. In commit 4ef9d7dc2db166cbe83fe4621385f034c9347fd2, for picasso, return directly and cause gfxoff disabled. Signed-off-by: Aaron Liu --- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index 2762ae4..fd7947e 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -1027,14 +1027,14 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev) case CHIP_VEGA20: break; case CHIP_RAVEN: - if (adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8) - break; - if ((adev->gfx.rlc_fw_version != 106 && -adev->gfx.rlc_fw_version < 531) || - (adev->gfx.rlc_fw_version == 53815) || - (adev->gfx.rlc_feature_version < 1) || - !adev->gfx.rlc.is_rlc_v2_1) + if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8) + &&((adev->gfx.rlc_fw_version != 106 && +adev->gfx.rlc_fw_version < 531) || + (adev->gfx.rlc_fw_version == 53815) || + (adev->gfx.rlc_feature_version < 1) || + !adev->gfx.rlc.is_rlc_v2_1)) adev->pm.pp_feature &= ~PP_GFXOFF_MASK; + if (adev->pm.pp_feature & PP_GFXOFF_MASK) adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG | AMD_PG_SUPPORT_CP | -- 2.7.4 ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH] drm/amdgpu: fix commit 4ef9d7d
On Tue, Aug 27, 2019 at 11:34 AM Aaron Liu wrote: > > For picasso(adev->pdev->device == 0x15d8)(adev->rev_id >= 0x8), > firmware is sufficient to support gfxoff. > In commit 4ef9d7dc2db166cbe83fe4621385f034c9347fd2, for picasso, > return directly and cause gfxoff disabled. > > Signed-off-by: Aaron Liu Reviewed-by: Alex Deucher > --- > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +++--- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > index 2762ae4..fd7947e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > @@ -1027,14 +1027,14 @@ static void gfx_v9_0_check_if_need_gfxoff(struct > amdgpu_device *adev) > case CHIP_VEGA20: > break; > case CHIP_RAVEN: > - if (adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8) > - break; > - if ((adev->gfx.rlc_fw_version != 106 && > -adev->gfx.rlc_fw_version < 531) || > - (adev->gfx.rlc_fw_version == 53815) || > - (adev->gfx.rlc_feature_version < 1) || > - !adev->gfx.rlc.is_rlc_v2_1) > + if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8) > + &&((adev->gfx.rlc_fw_version != 106 && > +adev->gfx.rlc_fw_version < 531) || > + (adev->gfx.rlc_fw_version == 53815) || > + (adev->gfx.rlc_feature_version < 1) || > + !adev->gfx.rlc.is_rlc_v2_1)) > adev->pm.pp_feature &= ~PP_GFXOFF_MASK; > + > if (adev->pm.pp_feature & PP_GFXOFF_MASK) > adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG | > AMD_PG_SUPPORT_CP | > -- > 2.7.4 > > ___ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[PATCH] drm/amdgpu: fix commit 4ef9d7d
For picasso(adev->pdev->device == 0x15d8)(adev->rev_id >= 0x8), firmware is sufficient to support gfxoff. In commit 4ef9d7dc2db166cbe83fe4621385f034c9347fd2, for picasso, return directly and cause gfxoff disabled. Signed-off-by: Aaron Liu --- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index 2762ae4..fd7947e 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -1027,14 +1027,14 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev) case CHIP_VEGA20: break; case CHIP_RAVEN: - if (adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8) - break; - if ((adev->gfx.rlc_fw_version != 106 && -adev->gfx.rlc_fw_version < 531) || - (adev->gfx.rlc_fw_version == 53815) || - (adev->gfx.rlc_feature_version < 1) || - !adev->gfx.rlc.is_rlc_v2_1) + if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8) + &&((adev->gfx.rlc_fw_version != 106 && +adev->gfx.rlc_fw_version < 531) || + (adev->gfx.rlc_fw_version == 53815) || + (adev->gfx.rlc_feature_version < 1) || + !adev->gfx.rlc.is_rlc_v2_1)) adev->pm.pp_feature &= ~PP_GFXOFF_MASK; + if (adev->pm.pp_feature & PP_GFXOFF_MASK) adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG | AMD_PG_SUPPORT_CP | -- 2.7.4 ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
