This was caused by a silent merge conflict, and is now fixed.

Regards, Joonas

Quoting kbuild test robot (2019-05-07 13:53:48)

tree: git://anongit.freedesktop.org/drm/drm-tip drm-tip head: 73db4ec12f05160528884c0b2c845b1c6b7c6718 commit: b9a2acf7709f52c77dc752ec99e3873e392d8df6 [5/8] Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' into drm-tip config: x86_64-rhel (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: git checkout b9a2acf7709f52c77dc752ec99e3873e392d8df6 # save the attached .config to linux build tree make ARCH=x86_64

If you fix the issue, kindly add following tag Reported-by: kbuild test robot lkp@intel.com

All errors (new ones prefixed by >>):

...

...

drivers/gpu/drm/i915/i915_request.c:827:1: error: redefinition of 'i915_request_await_start'

i915_request_await_start(struct i915_request *rq, struct i915_request *signal)
^~~~~~~~~~~~~~~~~~~~~~~~

drivers/gpu/drm/i915/i915_request.c:794:1: note: previous definition of 'i915_request_await_start' was here i915_request_await_start(struct i915_request *rq, struct i915_request *signal) ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/i915_request.c:794:1: warning: 'i915_request_await_start' defined but not used [-Wunused-function]

vim +/i915_request_await_start +827 drivers/gpu/drm/i915/i915_request.c

ca6e56f65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-04 825 a2bc4695b drivers/gpu/drm/i915/i915_gem_request.c Chris Wilson 2016-09-09 826 static int e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 @827 i915_request_await_start(struct i915_request *rq, struct i915_request *signal) e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 828 { e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 829 if (list_is_first(&signal->ring_link, &signal->ring->request_list)) e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 830 return 0; e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 831 e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 832 signal = list_prev_entry(signal, ring_link); e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 833 if (i915_timeline_sync_is_later(rq->timeline, &signal->fence)) e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 834 return 0; e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 835 e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 836 return i915_sw_fence_await_dma_fence(&rq->submit, e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 837 &signal->fence, 0, e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 838 I915_FENCE_GFP); e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 839 } e766fde65 drivers/gpu/drm/i915/i915_request.c Chris Wilson 2019-05-01 840

:::::: The code at line 827 was first introduced by commit :::::: e766fde6511e2be83acbca1d603035e08de23f3b drm/i915: Delay semaphore submission until the start of the signaler

:::::: TO: Chris Wilson chris@chris-wilson.co.uk :::::: CC: Joonas Lahtinen joonas.lahtinen@linux.intel.com

---

0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation