libdrm patch merge request

[Chen, Guchun]

Hi Alex,



Please help apply below 4 patches from my personal gitlab repository to drm master branch. CI pipeline passes with these 4 changes.

These patches are:

1) to remove external libjson-c dependence to keep amdgpu_test self-containing, and to fix the build problem mentioned below by Michel as well.

2) to move all unit test configurations to C code.



https://gitlab.freedesktop.org/guchunchen/drm



Patch 1: amdgpu: remove json package dependence<https://gitlab.freedesktop.org/guchunchen/drm/commit/a78c71f1336b7891267dc2bc44a8dfc34ce76357>
Patch 2: amdgpu: delete test configuration file<https://gitlab.freedesktop.org/guchunchen/drm/commit/ccd263511526d836a2782090a5df3d15870f2cbc>
Patch 3: amdgpu: add ras inject unit test<https://gitlab.freedesktop.org/guchunchen/drm/commit/7562611122ea64f0b590361963b38f6a33b3389d>
Patch 4: amdgpu: add ras feature capability check in inject test<https://gitlab.freedesktop.org/guchunchen/drm/commit/0405bc2f9138fe1b863160bb5c42d201631f6e15>



Regards,

Guchun



-----Original Message-----

From: Chen, Guchun

Sent: Monday, August 12, 2019 11:22 AM

To: 'Michel Dänzer' <michel at daenzer.net>; Alex Deucher <alexdeucher at gmail.com>

Cc: Zhou1, Tao <Tao.Zhou1 at amd.com>; amd-gfx at lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher at amd.com>; Li, Candice <Candice.Li at amd.com>; Li, Dennis <Dennis.Li at amd.com>; Zhang, Hawking <Hawking.Zhang at amd.com>

Subject: RE: libdrm patch merge request



Hi Michel,



My bad. Sorry for that.

My solution is to take the first suggestion from you, will prepare one patch soon for this.



Regards,

Guchun



-----Original Message-----

From: Michel Dänzer <mailto:michel at daenzer.net>

Sent: Friday, August 9, 2019 10:13 PM

To: Chen, Guchun <mailto:Guchun.Chen at amd.com>; Alex Deucher <mailto:alexdeucher at gmail.com>

Cc: Zhou1, Tao <mailto:Tao.Zhou1 at amd.com>; mailto:amd-gfx at lists.freedesktop.org; Deucher, Alexander <mailto:Alexander.Deucher at amd.com>; Li, Candice <mailto:Candice.Li at amd.com>; Li, Dennis <mailto:Dennis.Li at amd.com>; Zhang, Hawking <mailto:Hawking.Zhang at amd.com>

Subject: Re: libdrm patch merge request





This broke the CI pipeline:

https://gitlab.freedesktop.org/mesa/drm/pipelines/54903



Looks like the problem is that the autotools build doesn't properly disable the amdgpu tests when the json-c library is missing. I suggest the following:



1. Add a HAVE_JSONC guard in tests/Makefile.am 2. Add libjson-c-dev to the packages installed by the oldest-autotools

   job in .gitlab-ci.yml





Until libdrm uses GitLab merge requests to catch this kind of issue before it hits master, please push changes to a branch in a forked personal repository and make sure the CI pipeline comes back green before asking for them to be pushed to master.





Thanks,





On 2019-08-09 3:25 a.m., Chen, Guchun wrote:

> Thanks, Alex.

>

> Regards,

> Guchun

>

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

> From: Alex Deucher <mailto:alexdeucher at gmail.com>

> Sent: Friday, August 9, 2019 1:24 AM

> To: Chen, Guchun <mailto:Guchun.Chen at amd.com>

> Cc: Deucher, Alexander <mailto:Alexander.Deucher at amd.com>;

> mailto:amd-gfx at lists.freedesktop.org; Zhou1, Tao <mailto:Tao.Zhou1 at amd.com>; Li,

> Candice <mailto:Candice.Li at amd.com>; Li, Dennis <mailto:Dennis.Li at amd.com>; Zhang,

> Hawking <mailto:Hawking.Zhang at amd.com>

> Subject: Re: libdrm patch merge request

>

> Done!

>

> Alex

>

> On Thu, Aug 8, 2019 at 5:18 AM Chen, Guchun <mailto:Guchun.Chen at amd.com> wrote:

>>

>> Hi Alex,

>>

>>

>>

>> Would you mind merging attached 3 patches to libdrm master branch?

>>

>> These changes are implemented for gfx and umc ras inject unit test by amdgpu_test.

>>

>> Thanks a lot.

>>

>>

>>

>> Regards,

>>

>> Guchun

>>

>>

>>

>> _______________________________________________

>> amd-gfx mailing list

>> mailto:amd-gfx at lists.freedesktop.org

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

> _______________________________________________

> amd-gfx mailing list

> mailto:amd-gfx at lists.freedesktop.org

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

>





--

Earthling Michel Dänzer               |              https://www.amd.com

Libre software enthusiast             |             Mesa and X developer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20190830/70e47378/attachment-0001.html>