[igt-dev] Merge patches that are failing to land in the ML and patchworks

[Dixit, Ashutosh]

On Fri, 21 Oct 2022 08:35:18 -0700, Umesh Nerlige Ramappa wrote:
>

Hi Umesh/Lionel,

> Hi Petri,
>
> Reg: [igt-dev] [PATCH i-g-t v6 00/36] Add DG2 OA test
>
> I posted this series a while ago and I have some large XML files in these
> patches that are not landing in the ML because mail servers reject
> it. Hence, it does not make it to patchworks and I am not able to run
> pre-merge CI on the kernel patches.
>
> To resolve this, I am planning to just merge the XML files and relevant
> scripts as a separate series of 10 patches shared here:
>
> https://gitlab.freedesktop.org/unerlige/igt-gpu-tools/-/commits/master
>
> Once that is merged, I will post the remaining patches to the ML so that
> pre-merge can run. I did a sanity check on these patches with kbl, tgl,
> adlp (with guc) and I don't see any issues.
>
> Requesting an Ack for this.

I am getting the compile warning below. I tried removing the duplicated
definition from "lib/i915/perf-config: extend the device info" but then
that commit doesn't compile. Could you guys please fix this up and let me
know.

Thanks.
--
Ashutosh

[4/475] Compiling C object tests/core_hotunplug.p/core_hotunplug.c.o
In file included from ../lib/igt.h:29,
                 from ../tests/core_hotunplug.c:37:
../lib/igt_aux.h:334: warning: "DIV_ROUND_UP" redefined
  334 | #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
      |
In file included from ../tests/core_hotunplug.c:36:
../lib/i915/perf.h:35: note: this is the location of the previous definition
   35 | #define DIV_ROUND_UP(a, b)  (((a) + (b) - 1) / (b))
      |
[5/475] Compiling C object tests/perf.p/i915_perf.c.o
In file included from ../lib/igt.h:29,
                 from ../tests/i915/perf.c:43:
../lib/igt_aux.h:334: warning: "DIV_ROUND_UP" redefined
  334 | #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
      |
In file included from ../tests/i915/perf.c:42:
../lib/i915/perf.h:35: note: this is the location of the previous definition
   35 | #define DIV_ROUND_UP(a, b)  (((a) + (b) - 1) / (b))
      |
[84/84] Linking target tests/perf