* [PATCH Review V2 1/2] drm/amdgpu: fix unexpected block id @ 2023-04-11 9:32 Stanley.Yang 2023-04-11 9:32 ` [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag Stanley.Yang 0 siblings, 1 reply; 5+ messages in thread From: Stanley.Yang @ 2023-04-11 9:32 UTC (permalink / raw) To: amd-gfx, Hawking.Zhang, Tao.Zhou1, Guchun.Chen; +Cc: Stanley.Yang Aldebaran supports VCN and JPEG RAS, it reports unexpected block id message during VCN and JPEG RAS initialization if VCN and JPEG block id not defined. Change-Id: Icceb43556eec802f11c2077c1c58a1e92c9df599 Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 ++++ drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h index ef38f4c93df0..17b3d1992e80 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h @@ -583,6 +583,10 @@ amdgpu_ras_block_to_ta(enum amdgpu_ras_block block) { return TA_RAS_BLOCK__FUSE; case AMDGPU_RAS_BLOCK__MCA: return TA_RAS_BLOCK__MCA; + case AMDGPU_RAS_BLOCK__VCN: + return TA_RAS_BLOCK__VCN; + case AMDGPU_RAS_BLOCK__JPEG: + return TA_RAS_BLOCK__JPEG; default: WARN_ONCE(1, "RAS ERROR: unexpected block id %d\n", block); return TA_RAS_BLOCK__UMC; diff --git a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h index 509d8a1945eb..30d0482ac466 100644 --- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h @@ -84,6 +84,8 @@ enum ta_ras_block { TA_RAS_BLOCK__MP1, TA_RAS_BLOCK__FUSE, TA_RAS_BLOCK__MCA, + TA_RAS_BLOCK__VCN, + TA_RAS_BLOCK__JPEG, TA_NUM_BLOCK_MAX }; -- 2.17.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag 2023-04-11 9:32 [PATCH Review V2 1/2] drm/amdgpu: fix unexpected block id Stanley.Yang @ 2023-04-11 9:32 ` Stanley.Yang 2023-04-11 9:37 ` Zhang, Hawking 2023-04-11 10:08 ` Lazar, Lijo 0 siblings, 2 replies; 5+ messages in thread From: Stanley.Yang @ 2023-04-11 9:32 UTC (permalink / raw) To: amd-gfx, Hawking.Zhang, Tao.Zhou1, Guchun.Chen; +Cc: Stanley.Yang XGMI RAS should be according to the gmc xgmi physical nodes number, XGMI RAS should not be enabled if xgmi num_physical_nodes is zero. Change-Id: Idf3600b30584b10b528e7237d103d84d5097b7e0 Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index 4069bce9479f..c2c4d978896c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -2430,6 +2430,13 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev) else adev->ras_hw_enabled &= ~(1 << AMDGPU_RAS_BLOCK__VCN | 1 << AMDGPU_RAS_BLOCK__JPEG); + + /* + * XGMI RAS is not supported if xgmi num physical nodes + * is zero + */ + if (adev->gmc.xmgi.num_physical_nodes == 0) + adev->ras_hw_enabled &= ~(1 << AMDGPU_RAS_BLOCK__XGMI_WAFL); } else { dev_info(adev->dev, "SRAM ECC is not presented.\n"); } -- 2.17.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag 2023-04-11 9:32 ` [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag Stanley.Yang @ 2023-04-11 9:37 ` Zhang, Hawking 2023-04-11 10:08 ` Lazar, Lijo 1 sibling, 0 replies; 5+ messages in thread From: Zhang, Hawking @ 2023-04-11 9:37 UTC (permalink / raw) To: Yang, Stanley, amd-gfx@lists.freedesktop.org, Zhou1, Tao, Chen, Guchun Cc: Yang, Stanley [AMD Official Use Only - General] You might consider use ! adev->gmc.xmgi.num_physical_nodes, apart from that Series is Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Regards, Hawking -----Original Message----- From: Stanley.Yang <Stanley.Yang@amd.com> Sent: Tuesday, April 11, 2023 17:33 To: amd-gfx@lists.freedesktop.org; Zhang, Hawking <Hawking.Zhang@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com>; Chen, Guchun <Guchun.Chen@amd.com> Cc: Yang, Stanley <Stanley.Yang@amd.com> Subject: [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag XGMI RAS should be according to the gmc xgmi physical nodes number, XGMI RAS should not be enabled if xgmi num_physical_nodes is zero. Change-Id: Idf3600b30584b10b528e7237d103d84d5097b7e0 Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index 4069bce9479f..c2c4d978896c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -2430,6 +2430,13 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev) else adev->ras_hw_enabled &= ~(1 << AMDGPU_RAS_BLOCK__VCN | 1 << AMDGPU_RAS_BLOCK__JPEG); + + /* + * XGMI RAS is not supported if xgmi num physical nodes + * is zero + */ + if (adev->gmc.xmgi.num_physical_nodes == 0) + adev->ras_hw_enabled &= ~(1 << AMDGPU_RAS_BLOCK__XGMI_WAFL); } else { dev_info(adev->dev, "SRAM ECC is not presented.\n"); } -- 2.17.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag 2023-04-11 9:32 ` [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag Stanley.Yang 2023-04-11 9:37 ` Zhang, Hawking @ 2023-04-11 10:08 ` Lazar, Lijo 2023-04-11 10:20 ` Yang, Stanley 1 sibling, 1 reply; 5+ messages in thread From: Lazar, Lijo @ 2023-04-11 10:08 UTC (permalink / raw) To: Yang, Stanley, amd-gfx@lists.freedesktop.org, Zhang, Hawking, Zhou1, Tao, Chen, Guchun Cc: Yang, Stanley [AMD Official Use Only - General] > if (adev->gmc.xmgi. This looks like a typo. Should be gmc.xgmi Thanks, Lijo -----Original Message----- From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Stanley.Yang Sent: Tuesday, April 11, 2023 3:03 PM To: amd-gfx@lists.freedesktop.org; Zhang, Hawking <Hawking.Zhang@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com>; Chen, Guchun <Guchun.Chen@amd.com> Cc: Yang, Stanley <Stanley.Yang@amd.com> Subject: [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag XGMI RAS should be according to the gmc xgmi physical nodes number, XGMI RAS should not be enabled if xgmi num_physical_nodes is zero. Change-Id: Idf3600b30584b10b528e7237d103d84d5097b7e0 Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index 4069bce9479f..c2c4d978896c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -2430,6 +2430,13 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev) else adev->ras_hw_enabled &= ~(1 << AMDGPU_RAS_BLOCK__VCN | 1 << AMDGPU_RAS_BLOCK__JPEG); + + /* + * XGMI RAS is not supported if xgmi num physical nodes + * is zero + */ + if (adev->gmc.xmgi.num_physical_nodes == 0) + adev->ras_hw_enabled &= ~(1 << AMDGPU_RAS_BLOCK__XGMI_WAFL); } else { dev_info(adev->dev, "SRAM ECC is not presented.\n"); } -- 2.17.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag 2023-04-11 10:08 ` Lazar, Lijo @ 2023-04-11 10:20 ` Yang, Stanley 0 siblings, 0 replies; 5+ messages in thread From: Yang, Stanley @ 2023-04-11 10:20 UTC (permalink / raw) To: Lazar, Lijo, amd-gfx@lists.freedesktop.org, Zhang, Hawking, Zhou1, Tao, Chen, Guchun [AMD Official Use Only - General] Thanks, It's a typo, I have fixed it before be merged. Regards, Stanley > -----Original Message----- > From: Lazar, Lijo <Lijo.Lazar@amd.com> > Sent: Tuesday, April 11, 2023 6:08 PM > To: Yang, Stanley <Stanley.Yang@amd.com>; amd-gfx@lists.freedesktop.org; > Zhang, Hawking <Hawking.Zhang@amd.com>; Zhou1, Tao > <Tao.Zhou1@amd.com>; Chen, Guchun <Guchun.Chen@amd.com> > Cc: Yang, Stanley <Stanley.Yang@amd.com> > Subject: RE: [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag > > [AMD Official Use Only - General] > > > if (adev->gmc.xmgi. > > This looks like a typo. Should be gmc.xgmi > > Thanks, > Lijo > > -----Original Message----- > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of > Stanley.Yang > Sent: Tuesday, April 11, 2023 3:03 PM > To: amd-gfx@lists.freedesktop.org; Zhang, Hawking > <Hawking.Zhang@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com>; Chen, > Guchun <Guchun.Chen@amd.com> > Cc: Yang, Stanley <Stanley.Yang@amd.com> > Subject: [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag > > XGMI RAS should be according to the gmc xgmi physical nodes number, > XGMI RAS should not be enabled if xgmi num_physical_nodes is zero. > > Change-Id: Idf3600b30584b10b528e7237d103d84d5097b7e0 > Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > index 4069bce9479f..c2c4d978896c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > @@ -2430,6 +2430,13 @@ static void amdgpu_ras_check_supported(struct > amdgpu_device *adev) > else > adev->ras_hw_enabled &= ~(1 << > AMDGPU_RAS_BLOCK__VCN | > 1 << > AMDGPU_RAS_BLOCK__JPEG); > + > + /* > + * XGMI RAS is not supported if xgmi num physical > nodes > + * is zero > + */ > + if (adev->gmc.xmgi.num_physical_nodes == 0) > + adev->ras_hw_enabled &= ~(1 << > AMDGPU_RAS_BLOCK__XGMI_WAFL); > } else { > dev_info(adev->dev, "SRAM ECC is not > presented.\n"); > } > -- > 2.17.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-04-11 10:21 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-04-11 9:32 [PATCH Review V2 1/2] drm/amdgpu: fix unexpected block id Stanley.Yang 2023-04-11 9:32 ` [PATCH Review V2 2/2] drm/amdgpu: correct ras enabled flag Stanley.Yang 2023-04-11 9:37 ` Zhang, Hawking 2023-04-11 10:08 ` Lazar, Lijo 2023-04-11 10:20 ` Yang, Stanley
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.