2020-06-15 23:41:27

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: build failure after merge of the drm-intel-fixes tree

---

Hi all,

After merging the drm-intel-fixes tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/gpu/drm/i915/gt/intel_lrc.c:5972:
drivers/gpu/drm/i915/gt/selftest_lrc.c: In function 'live_timeslice_nopreempt':
drivers/gpu/drm/i915/gt/selftest_lrc.c:1333:3: error: too few arguments to function 'engine_heartbeat_disable'
1333 | engine_heartbeat_disable(engine);
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gt/selftest_lrc.c:54:13: note: declared here
54 | static void engine_heartbeat_disable(struct intel_engine_cs *engine,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gt/selftest_lrc.c:1402:3: error: too few arguments to function 'engine_heartbeat_enable'
1402 | engine_heartbeat_enable(engine);
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gt/selftest_lrc.c:64:13: note: declared here
64 | static void engine_heartbeat_enable(struct intel_engine_cs *engine,
| ^~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

04dc41776145 ("drm/i915/gt: Prevent timeslicing into unpreemptable requests")

I have reverted that commit for today.

--
Cheers,
Stephen Rothwell

---

Attachments:

(No filename) (495.00 B)
OpenPGP digital signature

2020-06-16 09:25:33

by Joonas Lahtinen

[permalink] [raw]

Subject: Re: linux-next: build failure after merge of the drm-intel-fixes tree

---

Quoting Stephen Rothwell (2020-06-16 02:39:12)
> Hi all,
>
> After merging the drm-intel-fixes tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/gpu/drm/i915/gt/intel_lrc.c:5972:
> drivers/gpu/drm/i915/gt/selftest_lrc.c: In function 'live_timeslice_nopreempt':
> drivers/gpu/drm/i915/gt/selftest_lrc.c:1333:3: error: too few arguments to function 'engine_heartbeat_disable'
> 1333 | engine_heartbeat_disable(engine);
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/i915/gt/selftest_lrc.c:54:13: note: declared here
> 54 | static void engine_heartbeat_disable(struct intel_engine_cs *engine,
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/i915/gt/selftest_lrc.c:1402:3: error: too few arguments to function 'engine_heartbeat_enable'
> 1402 | engine_heartbeat_enable(engine);
> | ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/i915/gt/selftest_lrc.c:64:13: note: declared here
> 64 | static void engine_heartbeat_enable(struct intel_engine_cs *engine,
> | ^~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 04dc41776145 ("drm/i915/gt: Prevent timeslicing into unpreemptable requests")
>
> I have reverted that commit for today.

Thanks for reporting. I had my drm-intel-fixes build tree configured
without selftests. I've now corrected that and added a missing dependency
patch.

Regards, Joonas

>
> --
> Cheers,
> Stephen Rothwell