* [PATCH] drm/amdgpu: fix build error
@ 2020-09-30 13:58 Guchun Chen
2020-09-30 14:02 ` Zhang, Hawking
0 siblings, 1 reply; 6+ messages in thread
From: Guchun Chen @ 2020-09-30 13:58 UTC (permalink / raw)
To: amd-gfx, alexander.deucher, Tom.StDenis; +Cc: Guchun Chen
Regression by patch:
fd583c4f01a7 drm/amdgpu: drop duplicated ecc check for vega10 (v4)
CC [M] drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.o
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c: In function ‘gmc_v9_0_late_init’:
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c:1216:59: error: expected ‘)’ before ‘{’ token
1216 | if (!(adev->ras_features & (1 << AMDGPU_RAS_BLOCK__UMC)) {
| ~ ^~
| )
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c:1220:2: error: expected expression before ‘}’ token
1220 | }
| ^
CC [M] drivers/gpu/drm/amd/amdgpu/umc_v6_1.o
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 151686888c32..6e9de02d5455 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1213,7 +1213,7 @@ static int gmc_v9_0_late_init(void *handle)
* writes, while disables HBM ECC for vega10.
*/
if (!amdgpu_sriov_vf(adev) && (adev->asic_type == CHIP_VEGA10)) {
- if (!(adev->ras_features & (1 << AMDGPU_RAS_BLOCK__UMC)) {
+ if (!(adev->ras_features & (1 << AMDGPU_RAS_BLOCK__UMC))) {
if (adev->df.funcs->enable_ecc_force_par_wr_rmw)
adev->df.funcs->enable_ecc_force_par_wr_rmw(adev, false);
}
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [PATCH] drm/amdgpu: fix build error
2020-09-30 13:58 [PATCH] drm/amdgpu: fix build error Guchun Chen
@ 2020-09-30 14:02 ` Zhang, Hawking
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Hawking @ 2020-09-30 14:02 UTC (permalink / raw)
To: Chen, Guchun, amd-gfx, Deucher, Alexander, StDenis, Tom; +Cc: Chen, Guchun
[AMD Public Use]
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Regards,
Hawking
-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Guchun Chen
Sent: Wednesday, September 30, 2020 21:59
To: amd-gfx@lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher@amd.com>; StDenis, Tom <Tom.StDenis@amd.com>
Cc: Chen, Guchun <Guchun.Chen@amd.com>
Subject: [PATCH] drm/amdgpu: fix build error
Regression by patch:
fd583c4f01a7 drm/amdgpu: drop duplicated ecc check for vega10 (v4)
CC [M] drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.o
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c: In function ‘gmc_v9_0_late_init’:
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c:1216:59: error: expected ‘)’ before ‘{’ token
1216 | if (!(adev->ras_features & (1 << AMDGPU_RAS_BLOCK__UMC)) {
| ~ ^~
| )
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c:1220:2: error: expected expression before ‘}’ token
1220 | }
| ^
CC [M] drivers/gpu/drm/amd/amdgpu/umc_v6_1.o
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 151686888c32..6e9de02d5455 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1213,7 +1213,7 @@ static int gmc_v9_0_late_init(void *handle)
* writes, while disables HBM ECC for vega10.
*/
if (!amdgpu_sriov_vf(adev) && (adev->asic_type == CHIP_VEGA10)) {
- if (!(adev->ras_features & (1 << AMDGPU_RAS_BLOCK__UMC)) {
+ if (!(adev->ras_features & (1 << AMDGPU_RAS_BLOCK__UMC))) {
if (adev->df.funcs->enable_ecc_force_par_wr_rmw)
adev->df.funcs->enable_ecc_force_par_wr_rmw(adev, false);
}
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Chawking.zhang%40amd.com%7C045f187fa8964bc861e508d86548fa73%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637370712043484513&sdata=GU%2FJfFpJEtWY52Yoe5%2FTF7RKNC139f1rM6NIQR9rInM%3D&reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] drm/amdgpu: fix build error
@ 2021-07-22 9:25 Guchun Chen
2021-07-22 14:14 ` Luben Tuikov
0 siblings, 1 reply; 6+ messages in thread
From: Guchun Chen @ 2021-07-22 9:25 UTC (permalink / raw)
To: amd-gfx, Hawking.Zhang, alexander.deucher, luben.tuikov; +Cc: Guchun Chen
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 <guchun.chen@amd.com>
---
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);
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/amdgpu: fix build error
2021-07-22 9:25 Guchun Chen
@ 2021-07-22 14:14 ` Luben Tuikov
2021-07-22 14:22 ` Chen, Guchun
0 siblings, 1 reply; 6+ messages in thread
From: Luben Tuikov @ 2021-07-22 14:14 UTC (permalink / raw)
To: Guchun Chen, amd-gfx, Hawking.Zhang, alexander.deucher
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 <guchun.chen@amd.com>
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 <luben.tuikov@amd.com>
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
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] drm/amdgpu: fix build error
2021-07-22 14:14 ` Luben Tuikov
@ 2021-07-22 14:22 ` Chen, Guchun
2021-07-22 14:43 ` Luben Tuikov
0 siblings, 1 reply; 6+ messages in thread
From: Chen, Guchun @ 2021-07-22 14:22 UTC (permalink / raw)
To: Tuikov, Luben, amd-gfx, Zhang, Hawking, Deucher, Alexander
[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 <Luben.Tuikov@amd.com>
Sent: Thursday, July 22, 2021 10:14 PM
To: Chen, Guchun <Guchun.Chen@amd.com>; amd-gfx@lists.freedesktop.org; Zhang, Hawking <Hawking.Zhang@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>
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 <guchun.chen@amd.com>
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 <luben.tuikov@amd.com>
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
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: fix build error
2021-07-22 14:22 ` Chen, Guchun
@ 2021-07-22 14:43 ` Luben Tuikov
0 siblings, 0 replies; 6+ messages in thread
From: Luben Tuikov @ 2021-07-22 14:43 UTC (permalink / raw)
To: Chen, Guchun, amd-gfx, Zhang, Hawking, Deucher, Alexander
Please push your patch now that it's been reviewed.
Regards,
Luben
On 2021-07-22 10:22 a.m., Chen, Guchun wrote:
> [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 <Luben.Tuikov@amd.com>
> Sent: Thursday, July 22, 2021 10:14 PM
> To: Chen, Guchun <Guchun.Chen@amd.com>; amd-gfx@lists.freedesktop.org; Zhang, Hawking <Hawking.Zhang@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>
> 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 <guchun.chen@amd.com>
> 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 <luben.tuikov@amd.com>
>
> 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
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-22 14:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-30 13:58 [PATCH] drm/amdgpu: fix build error Guchun Chen
2020-09-30 14:02 ` Zhang, Hawking
2021-07-22 9:25 Guchun Chen
2021-07-22 14:14 ` Luben Tuikov
2021-07-22 14:22 ` Chen, Guchun
2021-07-22 14:43 ` Luben Tuikov
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.