build broken on drm-next

Submitted by Huang, Ray on Dec. 10, 2018, 12:14 p.m.

Details

Message ID BY2PR12MB004008D011F3D09ED10050A5ECA50@BY2PR12MB0040.namprd12.prod.outlook.com
State New
Headers show
Series "build broken on drm-next" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Huang, Ray Dec. 10, 2018, 12:14 p.m.
Jack already have a patch to fix this issue. 

Thanks,
Ray

> -----Original Message-----

> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf

> Of StDenis, Tom

> Sent: Monday, December 10, 2018 8:07 PM

> To: Zhou, Tiecheng <Tiecheng.Zhou@amd.com>; amd-gfx mailing list <amd-

> gfx@lists.freedesktop.org>

> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>

> Subject: build broken on drm-next

> 

> Hi,

> 

> This commit

> 

> commit e421c656beefa1044f65cf50d7a7455df60cd703

> 

> Refs: v4.20-rc3-530-ge421c656beef

> 

> Author:     Tiecheng Zhou <Tiecheng.Zhou@amd.com>

> 

> AuthorDate: Fri Dec 7 09:11:35 2018 +0800

> 

> Commit:     Tiecheng Zhou <Tiecheng.Zhou@amd.com>

> 

> CommitDate: Mon Dec 10 11:14:27 2018 +0800

> 

> 

>      drm/amdgpu: bypass RLC init under sriov for Tonga

> 

>      RLC will go wrong in soft_reset under sriov

> 

>      Workaroound: only need to init RLC csb, and skip RLC stop, reset, start

>          this is because host-driver has already done full initialization on RLC

> 

>      Signed-off-by: Tiecehng Zhou <Tiecheng.Zhou@amd.com>

> 

>      Acked-by: Alex Deucher <alexander.deucher@amd.com>

> 

> 

> Causes a build error on amd-staging-drm-next:

> 

> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c: In function

> ‘gfx_v8_0_rlc_resume’:

> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c:4071:6: error: implicit declaration

> of function ‘amdgpu_sriov’; did you mean ‘amdgpu_sriov_vf’?

> [-Werror=implicit-function-declaration]

>    if (amdgpu_sriov(adev)) {

>        ^~~~~~~~~~~~

>        amdgpu_sriov_vf

>    CC [M]  drivers/gpu/drm/amd/amdgpu/sdma_v3_0.o

>    CC [M]  drivers/gpu/drm/amd/amdgpu/sdma_v4_0.o

>    CC [M]  drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.o

> cc1: some warnings being treated as errors

> make[4]: *** [scripts/Makefile.build:293:

> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.o] Error 1

> make[4]: *** Waiting for unfinished jobs....

> make[3]: *** [scripts/Makefile.build:518: drivers/gpu/drm/amd/amdgpu]

> Error 2

> make[2]: *** [scripts/Makefile.build:518: drivers/gpu/drm] Error 2

> make[1]: *** [scripts/Makefile.build:518: drivers/gpu] Error 2

> make: *** [Makefile:1060: drivers] Error 2

> 

> 

> Tom

> _______________________________________________

> amd-gfx mailing list

> amd-gfx@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Signed-off-by: Chengming Gui <Jack.Gui@amd.com>

---
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index a9c853a..08f443f 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -4068,7 +4068,7 @@  static void gfx_v8_0_rlc_start(struct amdgpu_device *adev)

 static int gfx_v8_0_rlc_resume(struct amdgpu_device *adev)
 {
-       if (amdgpu_sriov(adev)) {
+       if (amdgpu_sriov_vf(adev)) {
                gfx_v8_0_init_csb(adev);
                return 0;
        }

Comments

Thanks to Jack and Ray,

I'll pay more attention.

Tiecheng

-----Original Message-----
From: Huang, Ray <Ray.Huang@amd.com> 

Sent: Monday, December 10, 2018 8:15 PM
To: StDenis, Tom <Tom.StDenis@amd.com>; Zhou, Tiecheng <Tiecheng.Zhou@amd.com>; amd-gfx mailing list <amd-gfx@lists.freedesktop.org>
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Gui, Jack <Jack.Gui@amd.com>
Subject: RE: build broken on drm-next

Jack already have a patch to fix this issue. 

Thanks,
Ray

> -----Original Message-----

> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf 

> Of StDenis, Tom

> Sent: Monday, December 10, 2018 8:07 PM

> To: Zhou, Tiecheng <Tiecheng.Zhou@amd.com>; amd-gfx mailing list <amd- 

> gfx@lists.freedesktop.org>

> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>

> Subject: build broken on drm-next

> 

> Hi,

> 

> This commit

> 

> commit e421c656beefa1044f65cf50d7a7455df60cd703

> 

> Refs: v4.20-rc3-530-ge421c656beef

> 

> Author:     Tiecheng Zhou <Tiecheng.Zhou@amd.com>

> 

> AuthorDate: Fri Dec 7 09:11:35 2018 +0800

> 

> Commit:     Tiecheng Zhou <Tiecheng.Zhou@amd.com>

> 

> CommitDate: Mon Dec 10 11:14:27 2018 +0800

> 

> 

>      drm/amdgpu: bypass RLC init under sriov for Tonga

> 

>      RLC will go wrong in soft_reset under sriov

> 

>      Workaroound: only need to init RLC csb, and skip RLC stop, reset, start

>          this is because host-driver has already done full 

> initialization on RLC

> 

>      Signed-off-by: Tiecehng Zhou <Tiecheng.Zhou@amd.com>

> 

>      Acked-by: Alex Deucher <alexander.deucher@amd.com>

> 

> 

> Causes a build error on amd-staging-drm-next:

> 

> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c: In function

> ‘gfx_v8_0_rlc_resume’:

> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c:4071:6: error: implicit 

> declaration of function ‘amdgpu_sriov’; did you mean ‘amdgpu_sriov_vf’?

> [-Werror=implicit-function-declaration]

>    if (amdgpu_sriov(adev)) {

>        ^~~~~~~~~~~~

>        amdgpu_sriov_vf

>    CC [M]  drivers/gpu/drm/amd/amdgpu/sdma_v3_0.o

>    CC [M]  drivers/gpu/drm/amd/amdgpu/sdma_v4_0.o

>    CC [M]  drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.o

> cc1: some warnings being treated as errors

> make[4]: *** [scripts/Makefile.build:293:

> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.o] Error 1

> make[4]: *** Waiting for unfinished jobs....

> make[3]: *** [scripts/Makefile.build:518: drivers/gpu/drm/amd/amdgpu] 

> Error 2

> make[2]: *** [scripts/Makefile.build:518: drivers/gpu/drm] Error 2

> make[1]: *** [scripts/Makefile.build:518: drivers/gpu] Error 2

> make: *** [Makefile:1060: drivers] Error 2

> 

> 

> Tom

> _______________________________________________

> amd-gfx mailing list

> amd-gfx@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/amd-gfx