[Public] I guess your branch does not have below patch:
7afefb81b72c drm/amdgpu: Rename flag which prevents HW access Regards, Guchun -----Original Message----- From: Tuikov, Luben <[email protected]> Sent: Thursday, July 22, 2021 10:14 PM To: Chen, Guchun <[email protected]>; [email protected]; Zhang, Hawking <[email protected]>; Deucher, Alexander <[email protected]> Subject: Re: [PATCH] drm/amdgpu: fix build error On 2021-07-22 5:25 a.m., Guchun Chen wrote: > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu_cmn.c: In function > 'smu_cmn_send_msg_without_waiting': > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu_cmn.c:259:15: error: 'struct > amdgpu_device' has no member named 'in_pci_err_recovery' > if (smu->adev->in_pci_err_recovery) > ^~ > CC [M] drivers/staging/rtl8192u/ieee80211/ieee80211_tx.o > scripts/Makefile.build:272: recipe for target > 'drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu_cmn.o' failed > make[7]: *** [drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu_cmn.o] Error 1 > scripts/Makefile.build:515: recipe for target 'drivers/gpu/drm/amd/amdgpu' > failed > make[6]: *** [drivers/gpu/drm/amd/amdgpu] Error 2 > make[6]: *** Waiting for unfinished jobs.... > > Fixes: e070ba49f3a7 drm/amd/pm: Fix a bug communicating with the SMU (v5) > > Signed-off-by: Guchun Chen <[email protected]> Generally, there is no empty lines between tags. Not sure what happened here? Rename? This compiled and worked fine on my machine. Reviewed-by: Luben Tuikov <[email protected]> Regards, Luben > --- > drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c > b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c > index a48f18932357..a0e2111eb783 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c > @@ -256,7 +256,7 @@ int smu_cmn_send_msg_without_waiting(struct smu_context > *smu, > u32 reg; > int res; > > - if (smu->adev->in_pci_err_recovery) > + if (smu->adev->no_hw_access) > return 0; > > mutex_lock(&smu->message_lock); _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
