> -----Original Message----- > From: Chen, Guchun <Guchun.Chen@xxxxxxx> > Sent: 2019年9月19日 21:59 > To: Zhou1, Tao <Tao.Zhou1@xxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx; > Zhang, Hawking <Hawking.Zhang@xxxxxxx> > Subject: RE: [PATCH 05/21] drm/amdgpu: refine sdma4 ras_data_cb > > > > > Regards, > Guchun > > -----Original Message----- > From: Zhou1, Tao <Tao.Zhou1@xxxxxxx> > Sent: Thursday, September 19, 2019 3:13 PM > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx; Chen, Guchun > <Guchun.Chen@xxxxxxx>; Zhang, Hawking <Hawking.Zhang@xxxxxxx> > Cc: Zhou1, Tao <Tao.Zhou1@xxxxxxx> > Subject: [PATCH 05/21] drm/amdgpu: refine sdma4 ras_data_cb > > simplify code logic and refine return value > > Signed-off-by: Tao Zhou <tao.zhou1@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 32 ++++++++++++++------------ > 1 file changed, 17 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > index a8e4b7d880fe..f685a2377615 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > @@ -1942,25 +1942,27 @@ static int > sdma_v4_0_process_ras_data_cb(struct amdgpu_device *adev, > uint32_t err_source; > int instance; > > - if (!amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX)) { > - instance = sdma_v4_0_irq_id_to_seq(entry->client_id); > - if (instance < 0) > - return 0; > + if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX)) > + goto out; > > - switch (entry->src_id) { > - case SDMA0_4_0__SRCID__SDMA_SRAM_ECC: > - err_source = 0; > - break; > - case SDMA0_4_0__SRCID__SDMA_ECC: > - err_source = 1; > - break; > - default: > - return 0; > - } > + instance = sdma_v4_0_irq_id_to_seq(entry->client_id); > + if (instance < 0) > + goto out; > > - amdgpu_sdma_process_ras_data_cb(adev, err_data, entry); > + switch (entry->src_id) { > + case SDMA0_4_0__SRCID__SDMA_SRAM_ECC: > + err_source = 0; > [Guchun]Looks no one uses this variable. Can we remove it directly? I am not > sure why we added one switch case here. [Tao] OK, I'll remove it. > > + break; > + case SDMA0_4_0__SRCID__SDMA_ECC: > + err_source = 1; > + break; > + default: > + goto out; > } > > + amdgpu_sdma_process_ras_data_cb(adev, err_data, entry); > + > +out: > return AMDGPU_RAS_SUCCESS; > } > > -- > 2.17.1 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx